[libav-stable] [libav-commits] h264: slice-mt: check master context for valid current_picture_ptr

Reinhard Tartler siretart at gmail.com
Sat Jan 12 17:05:15 CET 2013


On Wed, Dec 5, 2012 at 11:21 PM, Janne Grunau <git at libav.org> wrote:
> Module: libav
> Branch: master
> Commit: 5945c7b35d9169caf9ecef1c419eebdebb909e60
>
> Author:    Janne Grunau <janne-libav at jannau.net>
> Committer: Janne Grunau <janne-libav at jannau.net>
> Date:      Wed Dec  5 20:08:01 2012 +0100
>
> h264: slice-mt: check master context for valid current_picture_ptr
>
> Fixes errors in slice based multithreading introduced in 0b300daad2f5.
>
> CC: libav-stable at libav.org
>
> ---
>
>  libavcodec/h264.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/libavcodec/h264.c b/libavcodec/h264.c
> index 942cb15..0525caa 100644
> --- a/libavcodec/h264.c
> +++ b/libavcodec/h264.c
> @@ -2624,7 +2624,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
>              s->picture_structure = last_pic_structure;
>              s->dropable          = last_pic_dropable;
>              return AVERROR_INVALIDDATA;
> -        } else if (!s->current_picture_ptr) {
> +        } else if (!s0->current_picture_ptr) {
>              av_log(s->avctx, AV_LOG_ERROR,
>                     "unset current_picture_ptr on %d. slice\n",
>                     h0->current_slice + 1);
>

NACK for 0.8 and earlier as commit 0b300daad2f5 was definitly not
present in 0.8 and earlier

>> git describe 0b300daad2f5
v9_beta2-389-g0b300da


-- 
regards,
    Reinhard


More information about the libav-stable mailing list