# HG changeset patch # User michael # Date 1231881225 0 # Node ID a29b5b5c3c9d9d80b604c7e5b33bf2f1a221ac4b # Parent 93dbb3999cc840b677aa36df3aed594c4ef14e63 Avoid using sub_id in mpeg1/2video. diff -r 93dbb3999cc8 -r a29b5b5c3c9d mpeg12.c --- a/mpeg12.c Tue Jan 13 19:38:54 2009 +0000 +++ b/mpeg12.c Tue Jan 13 21:13:45 2009 +0000 @@ -1265,7 +1265,8 @@ * 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;