mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
mpegvideo is back
Originally committed as revision 2507 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e240a0bbe0
commit
c512b303c2
@ -102,6 +102,7 @@ void avcodec_register_all(void)
|
|||||||
#endif
|
#endif
|
||||||
register_avcodec(&mpeg1video_decoder);
|
register_avcodec(&mpeg1video_decoder);
|
||||||
register_avcodec(&mpeg2video_decoder);
|
register_avcodec(&mpeg2video_decoder);
|
||||||
|
register_avcodec(&mpegvideo_decoder);
|
||||||
#ifdef HAVE_XVMC
|
#ifdef HAVE_XVMC
|
||||||
register_avcodec(&mpeg_xvmc_decoder);
|
register_avcodec(&mpeg_xvmc_decoder);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1523,6 +1523,7 @@ extern AVCodec wmv1_decoder;
|
|||||||
extern AVCodec wmv2_decoder;
|
extern AVCodec wmv2_decoder;
|
||||||
extern AVCodec mpeg1video_decoder;
|
extern AVCodec mpeg1video_decoder;
|
||||||
extern AVCodec mpeg2video_decoder;
|
extern AVCodec mpeg2video_decoder;
|
||||||
|
extern AVCodec mpegvideo_decoder;
|
||||||
extern AVCodec mpeg_xvmc_decoder;
|
extern AVCodec mpeg_xvmc_decoder;
|
||||||
extern AVCodec h263i_decoder;
|
extern AVCodec h263i_decoder;
|
||||||
extern AVCodec flv_decoder;
|
extern AVCodec flv_decoder;
|
||||||
|
@ -2655,6 +2655,20 @@ AVCodec mpeg2video_decoder = {
|
|||||||
.flush= ff_mpeg_flush,
|
.flush= ff_mpeg_flush,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//legacy decoder
|
||||||
|
AVCodec mpegvideo_decoder = {
|
||||||
|
"mpegvideo",
|
||||||
|
CODEC_TYPE_VIDEO,
|
||||||
|
CODEC_ID_MPEG2VIDEO,
|
||||||
|
sizeof(Mpeg1Context),
|
||||||
|
mpeg_decode_init,
|
||||||
|
NULL,
|
||||||
|
mpeg_decode_end,
|
||||||
|
mpeg_decode_frame,
|
||||||
|
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED,
|
||||||
|
.flush= ff_mpeg_flush,
|
||||||
|
};
|
||||||
|
|
||||||
#ifdef HAVE_XVMC
|
#ifdef HAVE_XVMC
|
||||||
static int mpeg_mc_decode_init(AVCodecContext *avctx){
|
static int mpeg_mc_decode_init(AVCodecContext *avctx){
|
||||||
Mpeg1Context *s;
|
Mpeg1Context *s;
|
||||||
|
Loading…
Reference in New Issue
Block a user