diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-24 14:51:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-24 15:00:39 +0200 |
| commit | 15a0fb58a3294876c23989915a4a6202411be1b0 (patch) | |
| tree | 06270e6af9c4d446b75a573b39161664e60c6a13 /libavcodec/mpegaudiodsp_template.c | |
| parent | bec180e1127f6753b5af1e6e5242020e0de12366 (diff) | |
| parent | 01cb4c84f54a52725c9b4b4dd6c609c36cccc5d4 (diff) | |
| download | ffmpeg-15a0fb58a3294876c23989915a4a6202411be1b0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideodec: Fix single symbol mode decoding
truespeech: drop useless casts
libavcodec: drop bogus dependencies from mpc[78] and qdm2
mpegaudio: move ff_mpa_enwindow to a separate file
AVOptions: store defaults for INT64 options in int64 union member.
Conflicts:
libavcodec/Makefile
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodsp_template.c')
| -rw-r--r-- | libavcodec/mpegaudiodsp_template.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index 5d004674ca..03a740a652 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -25,7 +25,6 @@ #include "mathops.h" #include "mpegaudiodsp.h" #include "mpegaudio.h" -#include "mpegaudiodata.h" #if CONFIG_FLOAT #define RENAME(n) n##_float |