Use rc_max_rate in av_find_best_stream() if bitrate == 0.

Fixes ticket #2042.
This commit is contained in:
Carl Eugen Hoyos 2014-05-31 13:25:31 +02:00
parent 925f7980eb
commit 6e67852881

View File

@ -3559,6 +3559,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
} }
count = st->codec_info_nb_frames; count = st->codec_info_nb_frames;
bitrate = avctx->bit_rate; bitrate = avctx->bit_rate;
if (!bitrate)
bitrate = avctx->rc_max_rate;
multiframe = FFMIN(5, count); multiframe = FFMIN(5, count);
if ((best_multiframe > multiframe) || if ((best_multiframe > multiframe) ||
(best_multiframe == multiframe && best_bitrate > bitrate) || (best_multiframe == multiframe && best_bitrate > bitrate) ||