diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 19:03:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 19:03:51 +0100 |
| commit | a8eb02da80dfc04fdc75e50db63e45075821c134 (patch) | |
| tree | da73e2533935d64115d6cda70991b6206e1741c2 | |
| parent | dbda57469456f03ed7ba921b97744751d0ccee39 (diff) | |
| parent | 1dbfaa34e615606cb3f1a3ecabb117e354459edc (diff) | |
| download | ffmpeg-a8eb02da80dfc04fdc75e50db63e45075821c134.tar.gz | |
Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4
* 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>
| -rw-r--r-- | libavcodec/h264_slice.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8b4511ce47..0d48064838 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -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; |