generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders.

Browse Source 
Originally committed as revision 16581 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2009-01-13 19:32:08 +00:00
parent 7f507b2d9e
commit cb595b7f02
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/Makefile
View File

@@ -124,6 +124,7 @@ OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlp_parser.o mlp.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlp_parser.o mlp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o
OBJS-$(CONFIG_MP1_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o

1
libavcodec/allcodecs.c
View File

@@ -189,6 +189,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (MACE3, mace3); REGISTER_DECODER (MACE3, mace3);
REGISTER_DECODER (MACE6, mace6); REGISTER_DECODER (MACE6, mace6);
REGISTER_DECODER (MLP, mlp); REGISTER_DECODER (MLP, mlp);
REGISTER_DECODER (MP1, mp1);
REGISTER_ENCDEC (MP2, mp2); REGISTER_ENCDEC (MP2, mp2);
REGISTER_DECODER (MP3, mp3); REGISTER_DECODER (MP3, mp3);
REGISTER_DECODER (MP3ADU, mp3adu); REGISTER_DECODER (MP3ADU, mp3adu);

2
libavcodec/mpegaudio_parser.c
View File

@@ -248,7 +248,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
AVCodecParser mpegaudio_parser = { AVCodecParser mpegaudio_parser = {
{ CODEC_ID_MP2, CODEC_ID_MP3 }, { CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3 },
sizeof(MpegAudioParseContext), sizeof(MpegAudioParseContext),
mpegaudio_parse_init, mpegaudio_parse_init,
mpegaudio_parse, mpegaudio_parse,

16
libavcodec/mpegaudiodec.c
View File

@@ -2534,6 +2534,22 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
} }
#endif /* CONFIG_MP3ON4_DECODER */ #endif /* CONFIG_MP3ON4_DECODER */
#ifdef CONFIG_MP1_DECODER
AVCodec mp1_decoder =
{
"mp1",
CODEC_TYPE_AUDIO,
CODEC_ID_MP1,
sizeof(MPADecodeContext),
decode_init,
NULL,
NULL,
decode_frame,
CODEC_CAP_PARSE_ONLY,
.flush= flush,
.long_name= NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
};
#endif
#ifdef CONFIG_MP2_DECODER #ifdef CONFIG_MP2_DECODER
AVCodec mp2_decoder = AVCodec mp2_decoder =
{ {