From patchwork Thu Dec 22 23:58:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1894 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp906002vsb; Thu, 22 Dec 2016 16:06:41 -0800 (PST) X-Received: by 10.194.58.198 with SMTP id t6mr10715667wjq.44.1482451601765; Thu, 22 Dec 2016 16:06:41 -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 o6si29852898wmi.105.2016.12.22.16.06.41; Thu, 22 Dec 2016 16:06:41 -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 66EEC68A4EC; Fri, 23 Dec 2016 02:06:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 650F968A4DD for ; Fri, 23 Dec 2016 02:06:31 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id u144so38818559wmu.0 for ; Thu, 22 Dec 2016 16:06:32 -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=UHxjgNEGfuRCrLhIuUFd8E+OhTKnrs4V/d9ag7TPta0=; b=iK2m3DgWRI0F6ihMbkkQbBk5xYzp9slTeSIEEv0vhltB/0cEe+Y36IT62AVvYMKD/z W+OHKmDjw3yM1VfMKBnCjl86Ioorkbj/5Dx0Cdx/TOdX+qwRwm9m9vFdzE6fxigEEjUG M5PwtkSPBPV12pbRTQ52hGmm8zafDt5B0dNCJMkJ7pwmaXzs8j3FMp/LRfGjcz/AcLU7 2DB7FLV9IGNACPnpyh8bBeeLQr3axenqIRs3xQUFiOmzMLLT66t3UoFdBoC2rAE7lbkp IH6iOqfd59L+sEP1krqjVlYL3IKG3SsMD31YKPKztwD81Qm3j8hVcOCqzj2yagqbi5gD kL8A== 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=UHxjgNEGfuRCrLhIuUFd8E+OhTKnrs4V/d9ag7TPta0=; b=LaozioIebIRIGbIOm7u2ex3BGHVRk25UFkjAY+QS4hFDR69TXLJ5AxoiC1/p74+z2Q 2T138g7WMXRimujYuJU2CzFiKVX09g6L3Gyry/+dZ1Pj/KjX5bogMj0q5ptwA1pYOY8L s1Kqwpmwy11Ps78YXldFZXhXFVAFNa7UgfGG/hSrTLzzaCw8n7lC6z+C6O0KwKYQScBZ k+kGz9ZvVdVLBuMyh0tJ1MiWrv294KMxAEFFOroN4wL9Yr5cwapeqOmFszWEB4exaeqK 27az3p/k6pJn8KTt5GrYdRvMrSIvlSWasahFrsFnVHx9jbuAsZbqy73+Gk9C8O2ntLfS DPNw== X-Gm-Message-State: AIkVDXKKeDJWPCo9/GEIO15na22626RZO5ORF6cTVrJ0IYdN2FKrsBjckYt1b2eJ5rr2dQ== X-Received: by 10.28.7.130 with SMTP id 124mr11050192wmh.18.1482451101716; Thu, 22 Dec 2016 15:58:21 -0800 (PST) Received: from [192.168.2.21] (pD9E8E5FA.dip0.t-ipconnect.de. [217.232.229.250]) by smtp.googlemail.com with ESMTPSA id lr10sm6475700wjb.6.2016.12.22.15.58.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Dec 2016 15:58:21 -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: Date: Fri, 23 Dec 2016 00:58:20 +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 2/3] mpeg12dec: validate color primaries 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 d3dc67ad6a..89aecd4de4 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1468,6 +1468,10 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) color_description = get_bits1(&s->gb); if (color_description) { s->avctx->color_primaries = get_bits(&s->gb, 8); + if (!av_color_primaries_name(s->avctx->color_primaries)) { + av_log(s->avctx, AV_LOG_WARNING, "Invalid color primaries %d, setting to unspecified\n", s->avctx->color_primaries); + s->avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + } s->avctx->color_trc = get_bits(&s->gb, 8); s->avctx->colorspace = get_bits(&s->gb, 8); if (!av_color_space_name(s->avctx->colorspace)) {