diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-07-01 21:08:20 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-07-01 21:08:20 +0000 |
| commit | 956dae9e77102832090f901e1a4a856985579016 (patch) | |
| tree | 0cf44d3bac280f9f161b5d21567f39089870165e | |
| parent | 060dd9300041eff91e7fb5622c12f9dd4975502d (diff) | |
| download | ffmpeg-956dae9e77102832090f901e1a4a856985579016.tar.gz | |
adu and mp3on4 functions are also needed by their respective float decoders
Originally committed as revision 23944 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 856eebd135..00ed7fc3f5 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -2124,7 +2124,7 @@ static void flush(AVCodecContext *avctx){ s->last_buf_size= 0; } -#if CONFIG_MP3ADU_DECODER +#if CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER static int decode_frame_adu(AVCodecContext * avctx, void *data, int *data_size, AVPacket *avpkt) @@ -2174,9 +2174,9 @@ static int decode_frame_adu(AVCodecContext * avctx, *data_size = out_size; return buf_size; } -#endif /* CONFIG_MP3ADU_DECODER */ +#endif /* CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER */ -#if CONFIG_MP3ON4_DECODER +#if CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER /** * Context for MP3On4 decoder @@ -2340,7 +2340,7 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, *data_size = out_size; return buf_size; } -#endif /* CONFIG_MP3ON4_DECODER */ +#endif /* CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER */ #if !CONFIG_FLOAT #if CONFIG_MP1_DECODER |