[FFmpeg-cvslog] ffmpeg: remove "has_b_frames" backpassing

Michael Niedermayer git at videolan.org
Tue Jun 3 15:31:40 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 14:24:37 2014 +0200| [a0b2de77ed30bcf42cee73688cd3acc4a19004fc] | committer: Michael Niedermayer

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 at gmx.at>

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

 ffmpeg.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 501af29..acfefe3 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] ++;



More information about the ffmpeg-cvslog mailing list