Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
dca7ba4b
Commit
dca7ba4b
authored
Jun 11, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
The files are only ever compiled if that condition is true.
parent
48e50921
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
9 deletions
+1
-9
ac3enc_float.c
libavcodec/ac3enc_float.c
+0
-4
eac3enc.c
libavcodec/eac3enc.c
+0
-2
dv.c
libavformat/dv.c
+1
-3
No files found.
libavcodec/ac3enc_float.c
View file @
dca7ba4b
...
@@ -33,12 +33,10 @@
...
@@ -33,12 +33,10 @@
#include "kbdwin.h"
#include "kbdwin.h"
#if CONFIG_AC3_ENCODER
#define AC3ENC_TYPE AC3ENC_TYPE_AC3
#define AC3ENC_TYPE AC3ENC_TYPE_AC3
#include "ac3enc_opts_template.c"
#include "ac3enc_opts_template.c"
static
const
AVClass
ac3enc_class
=
{
"AC-3 Encoder"
,
av_default_item_name
,
static
const
AVClass
ac3enc_class
=
{
"AC-3 Encoder"
,
av_default_item_name
,
ac3_options
,
LIBAVUTIL_VERSION_INT
};
ac3_options
,
LIBAVUTIL_VERSION_INT
};
#endif
#include "ac3enc_template.c"
#include "ac3enc_template.c"
...
@@ -127,7 +125,6 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl)
...
@@ -127,7 +125,6 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl)
}
}
#if CONFIG_AC3_ENCODER
AVCodec
ff_ac3_encoder
=
{
AVCodec
ff_ac3_encoder
=
{
.
name
=
"ac3"
,
.
name
=
"ac3"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ATSC A/52A (AC-3)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ATSC A/52A (AC-3)"
),
...
@@ -143,4 +140,3 @@ AVCodec ff_ac3_encoder = {
...
@@ -143,4 +140,3 @@ AVCodec ff_ac3_encoder = {
.
channel_layouts
=
ff_ac3_channel_layouts
,
.
channel_layouts
=
ff_ac3_channel_layouts
,
.
defaults
=
ac3_defaults
,
.
defaults
=
ac3_defaults
,
};
};
#endif
libavcodec/eac3enc.c
View file @
dca7ba4b
...
@@ -247,7 +247,6 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s)
...
@@ -247,7 +247,6 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s)
}
}
#if CONFIG_EAC3_ENCODER
AVCodec
ff_eac3_encoder
=
{
AVCodec
ff_eac3_encoder
=
{
.
name
=
"eac3"
,
.
name
=
"eac3"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ATSC A/52 E-AC-3"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ATSC A/52 E-AC-3"
),
...
@@ -263,4 +262,3 @@ AVCodec ff_eac3_encoder = {
...
@@ -263,4 +262,3 @@ AVCodec ff_eac3_encoder = {
.
channel_layouts
=
ff_ac3_channel_layouts
,
.
channel_layouts
=
ff_ac3_channel_layouts
,
.
defaults
=
ac3_defaults
,
.
defaults
=
ac3_defaults
,
};
};
#endif
libavformat/dv.c
View file @
dca7ba4b
/*
/*
* General DV
muxer/
demuxer
* General DV demuxer
* Copyright (c) 2003 Roman Shaposhnik
* Copyright (c) 2003 Roman Shaposhnik
*
*
* Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth
* Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth
...
@@ -553,7 +553,6 @@ static int dv_probe(AVProbeData *p)
...
@@ -553,7 +553,6 @@ static int dv_probe(AVProbeData *p)
return
0
;
return
0
;
}
}
#if CONFIG_DV_DEMUXER
AVInputFormat
ff_dv_demuxer
=
{
AVInputFormat
ff_dv_demuxer
=
{
.
name
=
"dv"
,
.
name
=
"dv"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"DV (Digital Video)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"DV (Digital Video)"
),
...
@@ -565,4 +564,3 @@ AVInputFormat ff_dv_demuxer = {
...
@@ -565,4 +564,3 @@ AVInputFormat ff_dv_demuxer = {
.
read_seek
=
dv_read_seek
,
.
read_seek
=
dv_read_seek
,
.
extensions
=
"dv,dif"
,
.
extensions
=
"dv,dif"
,
};
};
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment