[FFmpeg-cvslog] compute_pkt_fields2: dont interpret max_b_frames of < 0 as there being b frames.

Michael Niedermayer git at videolan.org
Fri Sep 14 02:37:43 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 14 02:30:00 2012 +0200| [062091f87f4cbef1cb6c2889e526d8640b795875] | committer: Michael Niedermayer

compute_pkt_fields2: dont interpret max_b_frames of <0 as there being b frames.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index bd22eec..7527784 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3431,7 +3431,7 @@ fail:
 
 //FIXME merge with compute_pkt_fields
 static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){
-    int delay = FFMAX(st->codec->has_b_frames, !!st->codec->max_b_frames);
+    int delay = FFMAX(st->codec->has_b_frames, st->codec->max_b_frames > 0);
     int num, den, frame_size, i;
 
     av_dlog(s, "compute_pkt_fields2: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n",



More information about the ffmpeg-cvslog mailing list