From patchwork Thu Dec 22 23:57:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1892 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp902679vsb; Thu, 22 Dec 2016 15:57:47 -0800 (PST) X-Received: by 10.194.81.233 with SMTP id d9mr12891056wjy.118.1482451067439; Thu, 22 Dec 2016 15:57:47 -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 ej4si33581838wjb.123.2016.12.22.15.57.46; Thu, 22 Dec 2016 15:57:47 -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 88C5968A4E0; Fri, 23 Dec 2016 01:57:43 +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 99BE668A4CF for ; Fri, 23 Dec 2016 01:57:36 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id kp2so38213599wjc.0 for ; Thu, 22 Dec 2016 15:57:37 -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=gvl0nMAplvTJBtrHhYDO6hBkKhwPSrah3uvf4euyQfE=; b=Xypq5Kxgytjx2PrRM9Lr/4yLRV4Z2NplECD7tQDBIOOdY96DuHw6YIqy4fiM8c1ASg CtAJTVL+gXepy8s29uUuEYrrQTnRvmZhXKZJWU9vl0Vvns64Atn1V2vH4zBJTysjH3jW qSOl35KzF6wTyK7O5Ssv62JZ6lCjQkEjR1gEt/DY7yCER72RV8zd1Uk/HCNHfesASOZk 2GG7EymomKIpZASrTzlFkGuO2BS6wlGb8ragM9fuHn/nZvaf67ALjiOwDhL558oe1D8G SoTCK7pAxDfLdyQNRjrUFyMLS+1/tamOLvuSASbZpsaQuJMt9kDT6PHltumRM/k21q9A p8nA== 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=gvl0nMAplvTJBtrHhYDO6hBkKhwPSrah3uvf4euyQfE=; b=ofkCV4kIcOJi1O+xBQmWzp7RvbFrDAgROlQlrTKYpHIQ1WQ6izBnhHqfWshgwuDTQK 3PTOgFAC8gZedyvBJe69jMkVh4q7A6fNNiTZvYnFP+ub97miXqzse62y3EEOI2ntqrPm wTb9J0lftS/3zih6oQY6W9muqPQnHSMlu444LJxgTHCsRFgc1KzlKpwi/rgm7hnqBQPL wkcj5lfsEpiuGcXBVkzHL296o425jHQMgn4t1xEiRPpZfXlB76lEckvszkp1ZcNiTX8R mQAblpUUqB5czsU4Ff+jWtStSLE8CjG2BsqdLax8xcyG5e+j1bWPVUpWyhlTw31cy7es PqPw== X-Gm-Message-State: AIkVDXJ2dELOy01TDNydll2X2a3kMEHQk42L2X8aUP9/moTqKlqIvcz3gkQnOd92eveAgQ== X-Received: by 10.194.66.101 with SMTP id e5mr10745106wjt.172.1482451056769; Thu, 22 Dec 2016 15:57:36 -0800 (PST) Received: from [192.168.2.21] (pD9E8E5FA.dip0.t-ipconnect.de. [217.232.229.250]) by smtp.googlemail.com with ESMTPSA id z6sm37801987wjt.24.2016.12.22.15.57.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Dec 2016 15:57:36 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <73b49b76-c0bd-be78-b9a0-2b95dffc0f2a@googlemail.com> Date: Fri, 23 Dec 2016 00:57:35 +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 1/3] mpeg12dec: validate color space 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 63979079c8..d3dc67ad6a 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1470,6 +1470,10 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) s->avctx->color_primaries = get_bits(&s->gb, 8); 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)) { + av_log(s->avctx, AV_LOG_WARNING, "Invalid color space %d, setting to unspecified\n", s->avctx->colorspace); + s->avctx->colorspace = AVCOL_SPC_UNSPECIFIED; + } } w = get_bits(&s->gb, 14); skip_bits(&s->gb, 1); // marker