Browse Source

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.
tags/n2.6
Anton Khirnov 11 years ago
parent
commit
0dea4c77cc
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavcodec/h264_slice.c

+ 5
- 2
libavcodec/h264_slice.c View File

@@ -553,8 +553,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 ((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;


Loading…
Cancel
Save