From patchwork Sun Apr 21 14:04:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12855 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 347454499CF for ; Sun, 21 Apr 2019 17:05:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D88668A7B4; Sun, 21 Apr 2019 17:05:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C390968A15C for ; Sun, 21 Apr 2019 17:05:22 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id c5so4019275wrs.11 for ; Sun, 21 Apr 2019 07:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WgZ0kZD6h1FfN/OjsaqRwvVGF6nfI8vHtgYEwIoQh7A=; b=KacUnWEmpRz6+tJEZYSazy6CvRQtAlK2XrDxOFiNgLlg37IV//V6hO2Xpt7kRoSOqp X5Ze0MatEmW1y2cwus3VdO8g0x1C7hiTdfmVddEkegH+3yqGjWaTKZYcsvQi/Rt1F7i6 DdPZYHqeKf5zx6YMm75Q6ovDP8XaMchIXzVKdOA91i/ou3kHbyzRTimpZ6UtwksLYSOc qpas1fnZzFGaapPGLmtcOgJYYly10qFTAKrzAxnRmDzLqMhEcpe0F0zunTi36Hm5t7z6 Lahom7vhd17Rytak+m6gYxKwdGOge4lSKjjxtVx4/8jhkSGXvSRs6xeDAhBbqQlYS0Qb 7aNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WgZ0kZD6h1FfN/OjsaqRwvVGF6nfI8vHtgYEwIoQh7A=; b=thVLRT3ipf6UIU/5cTtfO/2n51Wz4WLZ4eeds4gUk6H2r6ilZTzvjJo8ayTwxysM3b ScqwuOARaX+JR1vTK6fqp96EiyXwBAWZGvPRdohYitE5g4ihWFIkZt7NkAJqkyO9vpyD 1seVTQdVH8bVpkVRLa+CJkbzLXaqlY6K9irvsU5vtygwQKOf3mpkTMD7e900a+zN3eeb ZQr3gLlrv7U3rxKB/ni1q1NkGTPjw1LU/MYMY5UoSxcKrMXny5E3qAxk52GGF55y2hln B2YqlsmhW3distTZPbqn/66x2/ljsb3Bx01+MjtMB1lzcfh3LvU6i7ct6QzLyHwLPMGu 8zSQ== X-Gm-Message-State: APjAAAV4rI0I+rPfrvy/giRhpbdKA/ihQF8t2NUh5rOWcRi73v+UUQ6o 2n5z1OlQ0tnlQQzGPYQO09iX4bE/ X-Google-Smtp-Source: APXvYqzkTbGJY3OfPhkVVmCJcqKaeKSGG9l8ie+ArdrtFx0XXJqPRLSG2uHb9xpzg10N/MvKeZgkRA== X-Received: by 2002:a05:6000:cc:: with SMTP id q12mr10464216wrx.251.1555855522133; Sun, 21 Apr 2019 07:05:22 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id q24sm8175066wmj.26.2019.04.21.07.05.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Apr 2019 07:05:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Apr 2019 16:04:04 +0200 Message-Id: <20190421140404.17418-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190421140404.17418-1-andreas.rheinhardt@gmail.com> References: <20190421140404.17418-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] cbs_mpeg2: Correct 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now, things that are merely unsupported by cbs_mpeg2 have been declared to be invalid input. This has been changed. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 4 +--- libavcodec/cbs_mpeg2_syntax_template.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 954adc7d57..013358d5e4 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -233,9 +233,7 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx, START(MPEG2_START_GROUP, MPEG2RawGroupOfPicturesHeader, group_of_pictures_header, NULL); #undef START default: - av_log(ctx->log_ctx, AV_LOG_ERROR, "Unknown start code %02"PRIx32".\n", - unit->type); - return AVERROR_INVALIDDATA; + return AVERROR(ENOSYS); } } diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index 7b3f225396..1d31875d77 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -323,9 +323,9 @@ static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw, return FUNC(picture_coding_extension) (ctx, rw, ¤t->data.picture_coding); default: - av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid extension ID %d.\n", + av_log(ctx->log_ctx, AV_LOG_ERROR, "Extension ID %d not supported.\n", current->extension_start_code_identifier); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } }