diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 02:23:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 02:27:31 +0100 |
| commit | c1c836d9eb4f790146eb2aca24260982587f00ed (patch) | |
| tree | f7e4332b449a01dd2df9683b76523253d85e26f0 /libavcodec/mpegaudiodec_float.c | |
| parent | cd6851c5ef281e44af7028e08597c4dfb73d880f (diff) | |
| parent | 52767d891c665ab1124fe4ce82d99b59673de7d2 (diff) | |
| download | ffmpeg-c1c836d9eb4f790146eb2aca24260982587f00ed.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: fix multiplication overflow in avformat_find_stream_info()
cosmetics: indentation
mpegaudiodec: init static tables in AVCodec.init_static_data()
Conflicts:
libavcodec/mpegaudiodec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodec_float.c')
| -rw-r--r-- | libavcodec/mpegaudiodec_float.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index 4482168a3e..a0bc7696bf 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -28,6 +28,7 @@ AVCodec ff_mp1float_decoder = { .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_MP1, .priv_data_size = sizeof(MPADecodeContext), + .init_static_data = decode_init_static, .init = decode_init, .decode = decode_frame, #if FF_API_PARSE_FRAME @@ -43,6 +44,7 @@ AVCodec ff_mp2float_decoder = { .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_MP2, .priv_data_size = sizeof(MPADecodeContext), + .init_static_data = decode_init_static, .init = decode_init, .decode = decode_frame, #if FF_API_PARSE_FRAME @@ -58,6 +60,7 @@ AVCodec ff_mp3float_decoder = { .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_MP3, .priv_data_size = sizeof(MPADecodeContext), + .init_static_data = decode_init_static, .init = decode_init, .decode = decode_frame, #if FF_API_PARSE_FRAME @@ -73,6 +76,7 @@ AVCodec ff_mp3adufloat_decoder = { .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_MP3ADU, .priv_data_size = sizeof(MPADecodeContext), + .init_static_data = decode_init_static, .init = decode_init, .decode = decode_frame_adu, #if FF_API_PARSE_FRAME @@ -88,6 +92,7 @@ AVCodec ff_mp3on4float_decoder = { .type = AVMEDIA_TYPE_AUDIO, .id = CODEC_ID_MP3ON4, .priv_data_size = sizeof(MP3On4DecodeContext), + .init_static_data = decode_init_static, .init = decode_init_mp3on4, .close = decode_close_mp3on4, .decode = decode_frame_mp3on4, |