summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-03 14:24:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-03 15:23:43 +0200
commita0b2de77ed30bcf42cee73688cd3acc4a19004fc (patch)
treed4c1aa1dfe7d3406886b0cfeb38c165a589f09ae /ffmpeg.c
parent72e4ceeb7977aa1fde8069ac86c32988e6a0b0c6 (diff)
ffmpeg: remove "has_b_frames" backpassing
It seems working without this now for the files i tested it with, if this causes a regression, dont hesitate to put the line back or open a ticket or fix (if possible) the parser Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 501af29d91..acfefe32d1 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1859,7 +1859,10 @@ 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; //FIXME remove this once all AVParsers set it correctly
+
+ // 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 (*got_output || ret<0 || pkt->size)
decode_error_stat[ret<0] ++;