From patchwork Tue Apr 23 20:32:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12878 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 1949F447921 for ; Tue, 23 Apr 2019 23:42:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEB4F68A0FA; Tue, 23 Apr 2019 23:42:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5DB4680352 for ; Tue, 23 Apr 2019 23:42:26 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id b1so10603043wru.3 for ; Tue, 23 Apr 2019 13:42:26 -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=zly5VdE75ithbXXAXG4SYUuyWbwG7V4q+DKvLQD2H0A=; b=LZj9o51PC+9PmpOJyOHG5SXiEU5qj8kxLRAn8emOlZ2M/tWrlLDOJqBPqHgAvXFuy0 zeVTwgTP65Nw99eW4RFqzWZ65Zxh1E6QcO0C7B+P5D25n7kvBuWt8Jt0ycmd/XxkesOl xev9BmQyX1UFqGOZPElcCM58IO0Ldh+pJBdY6vsfBv5P36LMeFxT6nfJjQeDz2qrUN94 NDQ7fl8b8zgPpGtUw4bFk/WtR9B124dl4AlIhAcUqcOQ+F8+4PUkjLO1a8sbwIIO3ZVU m4BDZWSacfbYViZY+8SeiPjexWJKPkMjxU38wYr3qAx+HGvH2//bXLCFx4dZjtJQXIcA ACuw== 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=zly5VdE75ithbXXAXG4SYUuyWbwG7V4q+DKvLQD2H0A=; b=CFomiPMFWXSY0ptAWo7ERBe89ThX+rbbARsowT60/RkG17boW7AzXOalwll//U7dJx V8B73I8QDcz8sLxF4QxQ6Ik6BT/jW5pFN5Wh3A1NJleAFuNxVjuneDa+MW53HtTyU6QL e/f3vTBv/tFuUpSu6+eZP2R1Oc99gjcUCMG6fY+1X3BxRvAErsvGJNqQR+3FINAtg1JY Z0yLcqO5PvUfS7een2PK2VRYOQ63Rr4SZ6gJjAOnito72KFv7bnclKLbbC9ZIaO8PUai tz+3pyjgFNqTtltHuN5qpMx3nd8ypclSd/OyAcVTik3TTlSdqh2EIjpZj7V0Ah+OxBU6 wUEQ== X-Gm-Message-State: APjAAAWoL7KBs950FiBgcloRwvfquu012QeStikQcFcJISwEjrtIHm85 gFMA/iDkqd2r35mNxpRQIx4F8ib4 X-Google-Smtp-Source: APXvYqwYd8oZT06xjo94MGMM0uZYR8zg4A10kBA96ygboTpMN7dUzUqd9wHWInzJaGaaG4gsFEdkxw== X-Received: by 2002:a5d:4a87:: with SMTP id o7mr794572wrq.207.1556052146030; Tue, 23 Apr 2019 13:42:26 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id b8sm11193133wrf.21.2019.04.23.13.42.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 13:42:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Apr 2019 22:32:30 +0200 Message-Id: <20190423203230.4742-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190423203230.4742-1-andreas.rheinhardt@gmail.com> References: <20190421140404.17418-1-andreas.rheinhardt@gmail.com> <20190423203230.4742-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 96c2d2c22e..fce881d1c3 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -245,9 +245,7 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx, 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 f2718635c2..9aa8a378c9 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; } }