Commit 0dea4c77 authored by Anton Khirnov's avatar Anton Khirnov

h264: only ref cur_pic in update_thread_context if it is initialized

It may be empty if the previous thread's decode call did not contain a
valid frame.
parent 9abc80f1
...@@ -553,8 +553,11 @@ int ff_h264_update_thread_context(AVCodecContext *dst, ...@@ -553,8 +553,11 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1); h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1);
ff_h264_unref_picture(h, &h->cur_pic); ff_h264_unref_picture(h, &h->cur_pic);
if ((ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic)) < 0) if (h1->cur_pic.f.buf[0]) {
ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic);
if (ret < 0)
return ret; return ret;
}
h->workaround_bugs = h1->workaround_bugs; h->workaround_bugs = h1->workaround_bugs;
h->low_delay = h1->low_delay; h->low_delay = h1->low_delay;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment