From 4e9e0700fb8fd89b565032e6f049b91014ec1f3c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 2 Jul 2012 23:18:32 +0200 Subject: [PATCH] has_decode_delay_been_guessed: skip guessing when sps.num_reorder_frames is available Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 00a8239c47..67616af661 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2285,6 +2285,11 @@ static int has_codec_parameters(AVStream *st) static int has_decode_delay_been_guessed(AVStream *st) { if(st->codec->codec_id != CODEC_ID_H264) return 1; +#if CONFIG_H264_DECODER + if(st->codec->has_b_frames && + avpriv_h264_has_num_reorder_frames(st->codec) == st->codec->has_b_frames) + return 1; +#endif if(st->codec->has_b_frames<3) return st->info->nb_decoded_frames >= 6; return st->info->nb_decoded_frames >= 20;