Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:03:35 +0000 (19:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:03:51 +0000 (19:03 +0100)
* commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
libavcodec/h264_slice.c

See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_slice.c

index 8b4511c..0d48064 100644 (file)
@@ -647,8 +647,11 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
 
     h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1);
     ff_h264_unref_picture(h, &h->cur_pic);
-    if (h1->cur_pic.f.buf[0] && (ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic)) < 0)
-        return ret;
+    if (h1->cur_pic.f.buf[0]) {
+        ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic);
+        if (ret < 0)
+            return ret;
+    }
 
     h->workaround_bugs = h1->workaround_bugs;
     h->low_delay       = h1->low_delay;