diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 22:10:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 22:18:18 +0200 |
| commit | 9023de342f88e961a3741753aff68925eebf884e (patch) | |
| tree | c45518b146273fb14210f02cd41fa2c52624e39d /libavcodec/ac3enc_opts_template.c | |
| parent | 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c (diff) | |
| parent | 1470ce21cec5ee26e106e2a884c26bbf84e5aaea (diff) | |
Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'
* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea':
Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
G.723.1 demuxer and decoder
Add a shift parameter to celp_lp_synthesis_filter()
libopenjpeg: K&R formatting cosmetics
yadif: use emms_c() instead of inline assembly for emms invocations.
ac3: don't use different names for option tables in the template file.
lavfi: use const for AVFilterPad declarations in all filters.
adpcm: don't duplicate identical AVSampleFmt array for each encoder.
configure: cosmetics: Group test dependencies together
configure: add more passthrough flags in tms470 filter
configure: move flag filtering functions out of if/else blocks
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/ac3enc_fixed.c
libavcodec/allcodecs.c
libavcodec/eac3enc.c
libavcodec/g723_1.c
libavcodec/g723_1_data.h
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/v210dec.h
libavcodec/version.h
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
libavformat/Makefile
libavformat/allformats.c
libavformat/g723_1.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_opts_template.c')
| -rw-r--r-- | libavcodec/ac3enc_opts_template.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/ac3enc_opts_template.c b/libavcodec/ac3enc_opts_template.c index fa8984476e..1c67aa4164 100644 --- a/libavcodec/ac3enc_opts_template.c +++ b/libavcodec/ac3enc_opts_template.c @@ -23,13 +23,7 @@ #include "internal.h" #include "ac3.h" -#if AC3ENC_TYPE == AC3ENC_TYPE_AC3_FIXED -static const AVOption ac3fixed_options[] = { -#elif AC3ENC_TYPE == AC3ENC_TYPE_AC3 static const AVOption ac3_options[] = { -#else /* AC3ENC_TYPE_EAC3 */ -static const AVOption eac3_options[] = { -#endif /* Metadata Options */ {"per_frame_metadata", "Allow Changing Metadata Per-Frame", OFFSET(allow_per_frame_metadata), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, 1, AC3ENC_PARAM}, #if AC3ENC_TYPE != AC3ENC_TYPE_EAC3 |