RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'

Browse Source 
* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
	libavcodec/ac3enc_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-12 20:25:48 +02:00
commit c600c8e966
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ac3enc_float.c
View File

@ -33,7 +33,6 @@
#include "kbdwin.h"
#if CONFIG_AC3_ENCODER
#define AC3ENC_TYPE AC3ENC_TYPE_AC3
#include "ac3enc_opts_template.c"
static const AVClass ac3enc_class = {
@ -42,7 +41,6 @@ static const AVClass ac3enc_class = {
.option = ac3_options,
.version = LIBAVUTIL_VERSION_INT,
};
#endif
#include "ac3enc_template.c"
@ -137,7 +135,6 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl)
}
#if CONFIG_AC3_ENCODER
AVCodec ff_ac3_encoder = {
.name = "ac3",
.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
@ -153,4 +150,3 @@ AVCodec ff_ac3_encoder = {
.channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults,
};
#endif

2
libavcodec/eac3enc.c
View File

@ -251,7 +251,6 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s)
}
#if CONFIG_EAC3_ENCODER
AVCodec ff_eac3_encoder = {
.name = "eac3",
.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"),
@ -267,4 +266,3 @@ AVCodec ff_eac3_encoder = {
.channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults,
};
#endif

4
libavformat/dv.c
View File

@ -1,5 +1,5 @@
/*
* General DV muxer/demuxer
* General DV demuxer
* Copyright (c) 2003 Roman Shaposhnik
*
* Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth
@ -622,7 +622,6 @@ static int dv_probe(AVProbeData *p)
return 0;
}
#if CONFIG_DV_DEMUXER
AVInputFormat ff_dv_demuxer = {
.name = "dv",
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@ -634,4 +633,3 @@ AVInputFormat ff_dv_demuxer = {
.read_seek = dv_read_seek,
.extensions = "dv,dif",
};
#endif