On 12/02/15 13:16, Anton Khirnov wrote:
> It may be empty if the previous thread's decode call did not contain a
> valid frame.
> ---
> libavcodec/h264_slice.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
> index 47276dd..bedfab4 100644
> --- a/libavcodec/h264_slice.c
> +++ b/libavcodec/h264_slice.c
> @@ -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;
>
Set ok and stable-worthy.
lu
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
