From patchwork Mon Mar 27 13:56:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 3126 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp177818vss; Mon, 27 Mar 2017 06:57:00 -0700 (PDT) X-Received: by 10.28.24.16 with SMTP id 16mr9622796wmy.1.1490623020174; Mon, 27 Mar 2017 06:57:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b207si886713wme.143.2017.03.27.06.56.59; Mon, 27 Mar 2017 06:57:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A802688289; Mon, 27 Mar 2017 16:56:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 825F0680481 for ; Mon, 27 Mar 2017 16:56:28 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id x35so7652199qtc.1 for ; Mon, 27 Mar 2017 06:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=VdosHfXUh3uvQhlNL9OG38FcywQLJazoPao4qDptiLQ=; b=hq8+enVqbfoeWRbtEq9zYN+KOYAacJlb0Yx2Uus9rtCoJYzkGLghdJbvP+ssbZtm6/ tCd9vihDQvPK8mEezq/lIY+nOsI2pKZJ87fIAHUfAmNLh4Qmqb7Xg+ABjBt7pDZqqZO6 ym40gw917kqZ8V/twKepPCet7kCyBz2SlK4vIcKHoFteRUzTvSeT1sDzjxGYCtU3C9Ie Lt6LLnk5DwHLDlFsIDOrr06PP++GejekBUmtuUHXPSaa32fMYpq+OXkV0tUkhrEBl8jy CRQBwzwIFaMGMxkmiCrgWWuw1dqjX7eKeHX581QEco9lThy8s+j7cxwhRykmHGkcFPL7 v1hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VdosHfXUh3uvQhlNL9OG38FcywQLJazoPao4qDptiLQ=; b=atEd2Bey3b+cInrBOCtwv4j2HdiC/pJDhJubLWGM5EVB2gqSUR6kcs4YqBB1aS6mye ecLNGW+84wbIWjxIm6bs+6WP8+98SktKQioK15nkc0ZQi6ur1XNhtFAdW/asLquYX5OZ 98XQZ2NMDgvEM3CzqV58JLla1K5HzomgQtDPNRqDP2ssSqi3zj51U66BRZLtEyAuF8ps kZP1+SCsVbDRmPNUCBh0lsSONkGHtL0yvA+aia5+rKD8LpCwWG1rV5QYbuw1Uh3UMRAR Yxd0/2MH88jgDSCkaqhXN6w4KsqcV1rTPVZWo2fwrAo93E0diHLMmsABi4qZSeRJO/qx ikjQ== X-Gm-Message-State: AFeK/H03QHGTiQr0fd17N/lvzFRL1qddsOh3tIRN7vDi90lMRrBJm/h73nxk1oeVx6yNcg== X-Received: by 10.237.50.6 with SMTP id y6mr20563946qtd.115.1490623009116; Mon, 27 Mar 2017 06:56:49 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id t25sm406838qkt.25.2017.03.27.06.56.47 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 27 Mar 2017 06:56:47 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2017 09:56:46 -0400 Message-Id: <1490623006-41621-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [FFmpeg-devel] [PATCH] hevc: initialize no_rasl_output_flag in hevc_frame_start(). X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This prevents a race condition in files with multiple slices per frame. --- libavcodec/hevc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 505249e..bfe2386 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -825,8 +825,6 @@ static int hls_slice_header(HEVCContext *s) s->HEVClc->tu.cu_qp_offset_cb = 0; s->HEVClc->tu.cu_qp_offset_cr = 0; - s->no_rasl_output_flag = IS_IDR(s) || IS_BLA(s) || (s->nal_unit_type == NAL_CRA_NUT && s->last_eos); - return 0; } @@ -2676,6 +2674,8 @@ static int hevc_frame_start(HEVCContext *s) s->is_decoded = 0; s->first_nal_type = s->nal_unit_type; + s->no_rasl_output_flag = IS_IDR(s) || IS_BLA(s) || (s->nal_unit_type == NAL_CRA_NUT && s->last_eos); + if (s->ps.pps->tiles_enabled_flag) lc->end_of_tiles_x = s->ps.pps->column_width[0] << s->ps.sps->log2_ctb_size;