From patchwork Thu Mar 19 10:13:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18299 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CC75344BACC for ; Thu, 19 Mar 2020 12:21:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADA7C68B1B1; Thu, 19 Mar 2020 12:21:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED01768B1A2 for ; Thu, 19 Mar 2020 12:20:57 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id 26so177217wmk.1 for ; Thu, 19 Mar 2020 03:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fauHFiEPbU4Z5O7pSu5weLKExmuc4BmI6XIUgCQJITE=; b=uCeZ8EtsjSzyDmPjqwPbJVxA4frUqp4acUtXBBVfsVekvU1iVkq48JJU3K2we+gGNS swK9zcq/Ecb4uNd/GLpbPL1wKBkJ1pC1yAkRvoyk1EnKmFcmaw1fOlr/uuMIipdk+4hT X94Jq1qamDF45gRm8AoKeKhJz3utraH7l1L4ASpuah5ubfrGd3yXHpvcoTYGNMz2w7PW 0wE20uM7Kt5noV5DwFjcItVmQ7VcpMu3Jl0oKVTr7RhIcwr3D/jKP4MD3X0updrZU12m hMiwzbtTWWAiYPaNNNNPcQs2BY2xxLwAc1W3feiwDuutfCY7viA/nEhL7NT2mG9xcqfZ ou0Q== 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:date:message-id; bh=fauHFiEPbU4Z5O7pSu5weLKExmuc4BmI6XIUgCQJITE=; b=P8hS57oQRNMYKfNTjp3XK0B9PCwRByQd/5ZldJq4qbv4CL3IKC4KBujZSzDLblIrks T0828KxRE0oKFpRd76fJZOGzQnpAp1eOEypYwYuUD3Dhv94liKJNwGe2yCep5CQMPeeQ K4D0n22rJTcbcMDNoNZQbpMSRjBEYjIrGchzy6C8Ui3H+YfssN3ppeONivJ1ObLD/qyg MuXS8tba84MkkypzqB6b5DA9G60h52E9ffGQhN8TYGMQ773MegwmMGBlVUQeGmHQlDMs 3JOtF6mQEELDz/YAbraoAzG6beF0oXJ7pmviINVOw0rZTkW2qDhvDtlmA9zCQSeSlyQd eNlA== X-Gm-Message-State: ANhLgQ25nNZZi5uZWPPrAnH2g+0NbRBV6N6BevSjsf0T/hHce/Php0ER TTLPMivU1F+HJiHJfLS9cMXfkgDT X-Google-Smtp-Source: ADFU+vsBARHX2dUhurerhJsa46A9ewmFsNHYj9gIUwLG2CdFUj/FXqcsUnTwrTSwvmRaPuZ+rGbz4g== X-Received: by 2002:a1c:5544:: with SMTP id j65mr1520784wmb.60.1584612834814; Thu, 19 Mar 2020 03:13:54 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o10sm2736651wru.38.2020.03.19.03.13.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2020 03:13:54 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Mar 2020 11:13:45 +0100 Message-Id: <20200319101346.8883-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/yuv4mpegdec: use proper error codes 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/yuv4mpegdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index a11567e5ca..addc03057e 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -142,7 +142,7 @@ static int yuv4_read_header(AVFormatContext *s) } else { av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown " "pixel format.\n"); - return -1; + return AVERROR_INVALIDDATA; } while (tokstart < header_end && *tokstart != 0x20) tokstart++; @@ -240,7 +240,7 @@ static int yuv4_read_header(AVFormatContext *s) if (width == -1 || height == -1) { av_log(s, AV_LOG_ERROR, "YUV4MPEG has invalid header.\n"); - return -1; + return AVERROR_INVALIDDATA; } if (pix_fmt == AV_PIX_FMT_NONE) { From patchwork Thu Mar 19 10:13:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18298 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CCD4F44B615 for ; Thu, 19 Mar 2020 12:19:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EDC968B1A2; Thu, 19 Mar 2020 12:19:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B04868B0AA for ; Thu, 19 Mar 2020 12:19:26 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id m3so1440165wmi.0 for ; Thu, 19 Mar 2020 03:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=QabkSSqKvpVNiAQgzHNgVGNDmQt8ADGPQOj/2wxEP/s=; b=Z2AlOK5zPi1Q8Cq6LaAsE9C0harO97h95eoY7wOlL3R7TThIl5tpibgq5Mu30m7fVk sdVRJrYi6B0LOTRqQayRBPSOb31WiJm3hx8ubRATxqH8fShXFPz5+ACrrrB6r0nUS5ou 892b0cxDBJ75sMDgmW60rqgWxCp8DV2P4F7F0TA++3DKtlBRbx3B5GkJwY3JKwl8nr6A BpgHe5xFwPJPObQO5GiH3ygJxvVUak3O9Eo4lDEomQJM8pvJr0dQ8XFcrJislhIvHRXz xnEAtkls5BThcq7c4hLiAHblqASsSKOHFfkTgfAFl1Vwx9fTUXKJaKFaFj8mr890fulD 3chQ== 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:date:message-id:in-reply-to :references; bh=QabkSSqKvpVNiAQgzHNgVGNDmQt8ADGPQOj/2wxEP/s=; b=HgjV2VPwHdXQKCJahZVij6TwKpreWd8yjMi/o/eRaV/pgjRJbQdbCW9EF7DYF+cBpm 6aqDWafz5ko6hRf+16L1K26UBVxSdRPm09RlzbIBO5BrJMzDovf59+43OwcBrc5JOzQr WyZ+SeYqos6nQR99hGHh+qt2WNKzBuqL2aWQtgRAnPmPvJwihuG45PrdpZVbQ+A7kZcx gaQSA2pGbrHGatEJkq4hdtsXi5rdFoP8uAuxV6LaUxsGvU8c+WXKq+qcrN4QUycOl4zd BqCBhVnIVpoMfhwMQT+gWqy34zcuUghz1+8whIdH9zPJ9Dy8O0BO55cXrTmUUnwcYxr2 fsBQ== X-Gm-Message-State: ANhLgQ3d0gdHQwMcOeBSZS+LkLWd7BFohfpfMf3DleyCgV8SO6zH0YLC 0Ev2ahnCmklxZU51eOifERB8g4/r X-Google-Smtp-Source: ADFU+vu0/vXDf4aNtmKFxca/goALHyPinJTVDy/TBieZvcQxOkpEw9PGUmKjBsGcRIM/ugyn5GS5KQ== X-Received: by 2002:a1c:2285:: with SMTP id i127mr2629723wmi.152.1584612835828; Thu, 19 Mar 2020 03:13:55 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o10sm2736651wru.38.2020.03.19.03.13.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2020 03:13:55 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Mar 2020 11:13:46 +0100 Message-Id: <20200319101346.8883-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200319101346.8883-1-onemda@gmail.com> References: <20200319101346.8883-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/yuv4mpegdec: add support for 444alpha 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/yuv4mpegdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index addc03057e..980de7d145 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -124,9 +124,7 @@ static int yuv4_read_header(AVFormatContext *s) } else if (strncmp("422", tokstart, 3) == 0) { pix_fmt = AV_PIX_FMT_YUV422P; } else if (strncmp("444alpha", tokstart, 8) == 0 ) { - av_log(s, AV_LOG_ERROR, "Cannot handle 4:4:4:4 " - "YUV4MPEG stream.\n"); - return -1; + pix_fmt = AV_PIX_FMT_YUVA444P; } else if (strncmp("444", tokstart, 3) == 0) { pix_fmt = AV_PIX_FMT_YUV444P; } else if (strncmp("mono16", tokstart, 6) == 0) {