[FFmpeg-cvslog] Use rc_max_rate in av_find_best_stream() if bitrate == 0.

Carl Eugen Hoyos git at videolan.org
Sat May 31 14:16:36 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat May 31 13:25:31 2014 +0200| [6e67852881e4c8c3ef80dd6c3142c286bee6e272] | committer: Carl Eugen Hoyos

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

Fixes ticket #2042.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e67852881e4c8c3ef80dd6c3142c286bee6e272
---

 libavformat/utils.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d8f1363..1f72241 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3559,6 +3559,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
         }
         count = st->codec_info_nb_frames;
         bitrate = avctx->bit_rate;
+        if (!bitrate)
+            bitrate = avctx->rc_max_rate;
         multiframe = FFMIN(5, count);
         if ((best_multiframe >  multiframe) ||
             (best_multiframe == multiframe && best_bitrate >  bitrate) ||



More information about the ffmpeg-cvslog mailing list