From 062e7c3ca88905d93a68f4cac4ddf05be5aa426c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 13 Jan 2009 21:13:45 +0000 Subject: [PATCH] Avoid using sub_id in mpeg1/2video. Originally committed as revision 16587 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 52ab50b..0e41ffe 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1265,7 +1265,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ * that behave like P-frames. */ avctx->has_b_frames = !(s->low_delay); - if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID + assert((avctx->sub_id==1) == (avctx->codec_id==CODEC_ID_MPEG1VIDEO)); + if(avctx->codec_id==CODEC_ID_MPEG1VIDEO){ //MPEG-1 fps avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; -- 2.7.4