Avoid using sub_id in mpeg1/2video.

Originally committed as revision 16587 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · 062e7c3ca8
parent 593b321969
commit 062e7c3ca8
1 changed files with 2 additions and 1 deletions
--- 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;