summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-01 15:20:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-01 15:30:15 +0200
commit9fb45334fc534ec24137d27abcc1ba8ef3170a77 (patch)
tree3d4e9eb2878c55d0a0648c9e6fa35db4b424abc5 /ffmpeg.c
parentd09793576760c3f6894007184875a158b7be2347 (diff)
ffmpeg: copy b frame codec delay back from decoder to demuxer
The demuxer needs this value to generate correct timestamps in some corner cases Ideally the parser would always set this correctly, but some parsers lac support for extracting this value, also its not trivial. This fixes a regression Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 8c1faea7f5..f667bd8c7b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1856,6 +1856,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
ret = avcodec_decode_video2(ist->dec_ctx,
decoded_frame, got_output, pkt);
update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index);
+ ist->st->codec->has_b_frames = ist->dec_ctx->has_b_frames;
if (*got_output || ret<0 || pkt->size)
decode_error_stat[ret<0] ++;