Commit 062e7c3c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Avoid using sub_id in mpeg1/2video.

Originally committed as revision 16587 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 593b3219
...@@ -1265,7 +1265,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ ...@@ -1265,7 +1265,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){
* that behave like P-frames. */ * that behave like P-frames. */
avctx->has_b_frames = !(s->low_delay); 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 //MPEG-1 fps
avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; 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; avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment