diff options
| author | Juanjo <pulento@users.sourceforge.net> | 2002-04-15 02:28:05 +0000 |
|---|---|---|
| committer | Juanjo <pulento@users.sourceforge.net> | 2002-04-15 02:28:05 +0000 |
| commit | 4b1f4f236b1019e69396676f1eb455bbea0d8e17 (patch) | |
| tree | aac32420abdbb0e34991150d71f2d86bac11bcae /libavcodec/mpegaudiodec.c | |
| parent | 101bea5f2272dfcca084aeeb78ccb1c2e925b12b (diff) | |
| download | ffmpeg-4b1f4f236b1019e69396676f1eb455bbea0d8e17.tar.gz | |
- Versions defined for libav/libavcodec.
- Bug fix in wav muxer for MP2 audio.
- ffmpeg/libavcodec version in MPEG-4 user data.
Originally committed as revision 400 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index b423788ca8..f533743bda 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -2393,9 +2393,9 @@ static int decode_frame(AVCodecContext * avctx, return buf_ptr - buf; } -AVCodec mp3_decoder = +AVCodec mp2_decoder = { - "mpegaudio", + "mp2", CODEC_TYPE_AUDIO, CODEC_ID_MP2, sizeof(MPADecodeContext), @@ -2404,3 +2404,15 @@ AVCodec mp3_decoder = NULL, decode_frame, }; + +AVCodec mp3_decoder = +{ + "mp3", + CODEC_TYPE_AUDIO, + CODEC_ID_MP3LAME, + sizeof(MPADecodeContext), + decode_init, + NULL, + NULL, + decode_frame, +}; |