From 8b73a3f6f6598cb9249034fa020ddead3c943e2f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michaelni@gmx.at> Date: Sun, 3 Nov 2013 21:26:40 +0100 Subject: avformat/utils: never decrease has_b_frames in compute_pkt_fields() The intent of the original check was to increase has_b_frames when it was incorrectly set to 0. Later codecs allowed larger values Found-by: divVerent Signed-off-by: Michael Niedermayer <michaelni@gmx.at> --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/utils.c b/libavformat/utils.c index 3bb837a7b2..5637d17cba 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1039,7 +1039,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE) pkt->dts= AV_NOPTS_VALUE; - if (st->codec->codec_id != AV_CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B) + if (pc && pc->pict_type == AV_PICTURE_TYPE_B + && !st->codec->has_b_frames) //FIXME Set low_delay = 0 when has_b_frames = 1 st->codec->has_b_frames = 1; -- cgit v1.2.3