[FFmpeg-cvslog] ffmpeg: for h264 we need has_b_frames from the decoder

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 14 23:23:42 2014 +0200| [5ded0b390b6181a1f67cdf855a9f8f3e4f3526c8] | committer: Michael Niedermayer

ffmpeg: for h264 we need has_b_frames from the decoder

Other solutions welcome

Fixes Ticket3711

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

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

 ffmpeg.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 6338a68..f2aef21 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1886,11 +1886,16 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
 
     // The following line may be required in some cases where there is no parser
     // or the parser does not has_b_frames correctly
-//     ist->st->codec->has_b_frames = ist->dec_ctx->has_b_frames;
     if (ist->st->codec->has_b_frames < ist->dec_ctx->has_b_frames) {
-        av_log_ask_for_sample(ist->dec_ctx, "has_b_frames is larger in decoder than demuxer %d > %d ",
-            ist->dec_ctx->has_b_frames, ist->st->codec->has_b_frames
-        );
+        if (ist->dec_ctx->codec_id == AV_CODEC_ID_H264) {
+            ist->st->codec->has_b_frames = ist->dec_ctx->has_b_frames;
+        } else
+            av_log_ask_for_sample(
+                ist->dec_ctx,
+                "has_b_frames is larger in decoder than demuxer %d > %d ",
+                ist->dec_ctx->has_b_frames,
+                ist->st->codec->has_b_frames
+            );
     }
 
     if (*got_output || ret<0 || pkt->size)