diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-20 05:42:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-20 05:48:22 +0200 |
| commit | 80d156d7fdc44b09783ba242fe2681a6d4cc8df5 (patch) | |
| tree | 7881b70297c87daa2f6d6f4790afaf438c53b3aa /libavcodec/mpegaudioenc.c | |
| parent | 6efb29686fc9a7f76480405df8fe7eaa7a9dd4cf (diff) | |
| parent | 984ece7503597d30e6f3bdeb67e337ea1616f880 (diff) | |
| download | ffmpeg-80d156d7fdc44b09783ba242fe2681a6d4cc8df5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qdm2: Use floating point synthesis filter.
h264: correct border check.
h264: fix loopfilter with threading at slice boundaries.
Fix ff_mpa_synth_filter_fixed() prototype
Rename costablegen.c ---> cos_tablegen.c.
Collapse tableprint.c into tableprint.h.
Simplify trig table rules
Remove potentially unstable filenames from comments in generated files.
Ignore generated tables and generated table generator programs.
Simplify CLEANFILES make variable by using wildcards.
Remove silly insults from avformat_version() Doxygen documentation.
mpegaudiodsp: fix x86 and ppc makefiles
configure: Adjust AVX assembler check.
mpegaudio: remove unused version of SAME_HEADER_MASK
mpegaudio: remove useless #undef at end of file
asfdec: add missing #include for av_bswap32()
mpegaudio: merge two #if CONFIG_FLOAT blocks
mpegaudio: move some struct definitions from mpegaudio.h
Move some mpegaudio functions to new mpegaudiodsp subsystem
Conflicts:
libavcodec/h264.c
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc.c')
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index 515da6f670..c3d86137fa 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -782,5 +782,3 @@ AVCodec ff_mp2_encoder = { .supported_samplerates= (const int[]){44100, 48000, 32000, 22050, 24000, 16000, 0}, .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), }; - -#undef FIX |