[FFmpeg-cvslog] avcodec/h264: fix droped frame handling also for threads > 1

Michael Niedermayer git at videolan.org
Thu Feb 27 08:08:34 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 27 03:57:39 2014 +0100| [64bb64f704f751c50f8474e85eb84a6326b44b50] | committer: Michael Niedermayer

avcodec/h264: fix droped frame handling also for threads > 1

Seems i mistakely tested just with threads=1
Fixes part of Ticket3386

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

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

 libavcodec/h264.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index eccd6db..012319e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -367,6 +367,7 @@ static int ref_picture(H264Context *h, Picture *dst, Picture *src)
     dst->crop_left     = src->crop_left;
     dst->crop_top      = src->crop_top;
     dst->recovered     = src->recovered;
+    dst->invalid_gap   = src->invalid_gap;
 
     return 0;
 fail:
@@ -1978,6 +1979,7 @@ static int h264_frame_start(H264Context *h)
     pic->f.key_frame = 0;
     pic->mmco_reset  = 0;
     pic->recovered   = 0;
+    pic->invalid_gap = 0;
 
     if ((ret = alloc_picture(h, pic)) < 0)
         return ret;



More information about the ffmpeg-cvslog mailing list