From patchwork Fri Jan 6 20:44:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2088 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5996168vsb; Fri, 6 Jan 2017 12:44:26 -0800 (PST) X-Received: by 10.223.161.222 with SMTP id v30mr3043138wrv.80.1483735466627; Fri, 06 Jan 2017 12:44:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t36si1592136wrc.56.2017.01.06.12.44.25; Fri, 06 Jan 2017 12:44:26 -0800 (PST) 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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3813B68A314; Fri, 6 Jan 2017 22:44:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B727A6891F3 for ; Fri, 6 Jan 2017 22:44:11 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id qs7so43029265wjc.1 for ; Fri, 06 Jan 2017 12:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=zPwjXjULb7hZ2m02XeB29Y9lyCAu4L/lJbpwqRvLS9U=; b=rtJM3+a5I3yn4+lCQHWXio7s9N6gC2waizOS7mPJDGqVA04ztrS0x73qM0iuOcpz/q vtPKq3ACDvmA4OCuGkOHxaTcc26LXE9LEGb7D6yN8JtzzPpq+xXSOdF78R+BlwswpYbd lopyqQZ2ygIG944euMPNF74Pv8K57gJbJWdsWVflVUhWTjenFW/OfCuShFk5QPUB0ehq jTVF2btcX3RDCTON1e/Xw84n3dP+fZYYGZee2vWMX3MbSS1zs/I8R73gv7MdE5Frv/0d ieFzhYTTD2k4MfeaPxiDfz+Vieiu5406Js245JTAKXIho71M2Aobca+gkkCRGM3Id0WF FAQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=zPwjXjULb7hZ2m02XeB29Y9lyCAu4L/lJbpwqRvLS9U=; b=gDneFFkKuJy1YWjvO9jvDbzTo1n8UmkxA56nEP+o1rqyepvZy1UJxDsa/2Dr6LbFi6 B+6CU1SxIny6cB/XB2BEOfBKIV4Wg/MdqiRNuaF4QF7lLliRxOQTr/qMAUDoG84G11GS uV52X7C23yGhrBAFTBka140gqfnHLrNdtii5Nz94QQjrz1WAXUIiSaXaCzmpHLNF26Nt pDhKB1o+OZ+wl04tqx6UBf1wzExEuRV851nLlxLcqKX6O8QMcbGD5awlt9mXJMfTj3tu Q4hZeTWYVtlQ/mHrJXo6lpiopnTxkh8nJzY93YRcdZ/avYFSmgL3YVkqQFtagZdvcIEc nEuA== X-Gm-Message-State: AIkVDXJu3ThxAoBB9xo/3qYNtrpQQwmvfBOdtFaK935BcbWcdJrNEDss3dJsGvMrBIOWYw== X-Received: by 10.194.141.47 with SMTP id rl15mr34938514wjb.135.1483735457134; Fri, 06 Jan 2017 12:44:17 -0800 (PST) Received: from [192.168.2.21] (p5B072B3E.dip0.t-ipconnect.de. [91.7.43.62]) by smtp.googlemail.com with ESMTPSA id d184sm5141708wmd.8.2017.01.06.12.44.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 12:44:16 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <76824ab4-271d-ca78-23ce-bcec85877b7d@googlemail.com> Date: Fri, 6 Jan 2017 21:44:16 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] h264_ps: validate chroma sample location 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Cadhalpun --- libavcodec/h264_ps.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 8218e3a010..089bfc650a 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -181,6 +181,10 @@ static inline int decode_vui_parameters(GetBitContext *gb, AVCodecContext *avctx if (get_bits1(gb)) { /* chroma_sample_location_type_top_field */ avctx->chroma_sample_location = get_ue_golomb(gb) + 1; + if (!av_chroma_location_name(avctx->chroma_sample_location)) { + av_log(avctx, AV_LOG_WARNING, "Invalid chroma sample location %d, setting to unspecified\n", avctx->chroma_sample_location); + avctx->chroma_sample_location = AVCHROMA_LOC_UNSPECIFIED; + } get_ue_golomb(gb); /* chroma_sample_location_type_bottom_field */ }