Browse Source

Make b_frame_strategy not fail on pass 2, but still print a notice.

Originally committed as revision 5425 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Corey Hickey 19 years ago
parent
commit
b29183a150
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/mpegvideo.c

+ 2
- 2
libavcodec/mpegvideo.c View File

@@ -1123,8 +1123,8 @@ int MPV_encode_init(AVCodecContext *avctx)
} }


if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){ if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){
av_log(avctx, AV_LOG_ERROR, "b_frame_strategy must be 0 on the second pass\n");
return -1;
av_log(avctx, AV_LOG_INFO, "notice: b_frame_strategy only affects the first pass\n");
avctx->b_frame_strategy = 0;
} }


i= ff_gcd(avctx->time_base.den, avctx->time_base.num); i= ff_gcd(avctx->time_base.den, avctx->time_base.num);


Loading…
Cancel
Save