From patchwork Thu Dec 22 23:59:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1893 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp903128vsb; Thu, 22 Dec 2016 15:59:16 -0800 (PST) X-Received: by 10.28.23.137 with SMTP id 131mr11384218wmx.121.1482451156165; Thu, 22 Dec 2016 15:59:16 -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 eb8si33528505wjd.281.2016.12.22.15.59.15; Thu, 22 Dec 2016 15:59:16 -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 736AE68A4E8; Fri, 23 Dec 2016 01:59:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D0D368A4D6 for ; Fri, 23 Dec 2016 01:59:07 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id u144so38797524wmu.0 for ; Thu, 22 Dec 2016 15:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=PXiXThSfzBPE+upnwFEaLt6b2gAoTX0dYqEKKL38dXU=; b=L3H8zaQRoCf9syatn8MRFTwW3ur67UvwQhnBba8hbNPs55QTvhRt75aUXx/wuky7Yh QWf05XPGgvDrfXrcvyjCuBVYEwTVDoPNWhmbbeKlB/Nd1qRNB2nR7tPR3ACBR+/i8r58 z8ZGktYdOVIspoBa+nADi+rV+k3b1xLbPMx3MFrdYUjM+17iah7p2tHk3WD52L1SDfaO IrmAvsWe2/J1FH2aIbYF0G9sC9xGZaJHC87AKxE9OuubVwYR2k1O7wutywoo/0dY75s1 2jyV+PuYfZc+I5Wp9/BcUEJbt+4BpbeHo3LEhblUGU1di3uyR+LQYiMUEugB+sLcde67 8VTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=PXiXThSfzBPE+upnwFEaLt6b2gAoTX0dYqEKKL38dXU=; b=OS17QBxAsMDNCY8WeGIgW/7bOZ8mcMnZLqyM0e2aq8sCqgHxJfOBKsIlZpi2JXvz0p ZCExFUku2UfTQ0GmVre5/P0zG7Z4ecZ2d7ty688Urfwd5dn8HksSJT8iNX1K/enJNx6M uR0uNuIDRkUBaJ27+VpjmqtFORDDdXtn+kRY/CuEfXDGlCRlv1skPIQaIGuFVlU7gR3a xrL2BUUdH8tJlv1DICHFSKdDHfVP2hhRv3tQEB732nzFL98Z3KzLKXx2RIsLn4otHvBg PgXXeJby85+/a8a2+nAhT1lvghGZPDUAFIo2tJxMoj+LbgHKQh+r1/JWntuYTicWJZoo m6zQ== X-Gm-Message-State: AIkVDXIJKySDe0c1uAhOKHwk0de8PS4Ak13ZUZw3XxoXgT4JJB4YDTnZOsqTS6gHKKCFtg== X-Received: by 10.28.206.11 with SMTP id e11mr1091053wmg.88.1482451147290; Thu, 22 Dec 2016 15:59:07 -0800 (PST) Received: from [192.168.2.21] (pD9E8E5FA.dip0.t-ipconnect.de. [217.232.229.250]) by smtp.googlemail.com with ESMTPSA id di9sm37916472wjc.37.2016.12.22.15.59.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Dec 2016 15:59:06 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <73b49b76-c0bd-be78-b9a0-2b95dffc0f2a@googlemail.com> Message-ID: <7e14d073-7abe-03c0-d347-80f05343c4de@googlemail.com> Date: Fri, 23 Dec 2016 00:59:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <73b49b76-c0bd-be78-b9a0-2b95dffc0f2a@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/3] mpeg12dec: validate color transfer characteristics 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/mpeg12dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 89aecd4de4..964f498f3b 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1473,6 +1473,10 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) s->avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; } s->avctx->color_trc = get_bits(&s->gb, 8); + if (!av_color_transfer_name(s->avctx->color_trc)) { + av_log(s->avctx, AV_LOG_WARNING, "Invalid color transfer characteristics %d, setting to unspecified\n", s->avctx->color_trc); + s->avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + } s->avctx->colorspace = get_bits(&s->gb, 8); if (!av_color_space_name(s->avctx->colorspace)) { av_log(s->avctx, AV_LOG_WARNING, "Invalid color space %d, setting to unspecified\n", s->avctx->colorspace);