diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-14 02:30:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-14 02:30:00 +0200 |
| commit | 062091f87f4cbef1cb6c2889e526d8640b795875 (patch) | |
| tree | 4cc419f2ecc5c78f642f09e1eb3bcedaf8145db5 | |
| parent | c21f81999a3cd7a98063585e439dd3055d0eb32a (diff) | |
| download | ffmpeg-062091f87f4cbef1cb6c2889e526d8640b795875.tar.gz | |
compute_pkt_fields2: dont interpret max_b_frames of <0 as there being b frames.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index bd22eecbf2..7527784742 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", |