From patchwork Wed May 6 23:20:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19520 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 ED95744AD9B for ; Thu, 7 May 2020 02:20:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB1766883C8; Thu, 7 May 2020 02:20:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C862E6881C4 for ; Thu, 7 May 2020 02:20:18 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id u22so1263635plq.12 for ; Wed, 06 May 2020 16:20:18 -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; bh=SpvvFz1arHHUmo/9Hl752ZqIVITMtb0EULUgtmukwGQ=; b=XOJVg1TVNAnbP4zWhfu9zKfBUa5yYIMUDF30FqZqO6J9+ImWpZIeD8Njd30+JGIzCp WWu349oQn+n3FAKhUs8+CgHWiLuUhkOiYKty83s1ZVIzx4UZLWUEfBXKLMlzTx2JD0NR XMdq/LK3+79ncxuJX0FpbgxKbxg+AoGN/rx6APhw7lJHmHuVX/XzeZNIPqjl8byxUTyj AktcnXHojSHY26WKAP8zF+MbFOu1AF09eXJCcb3LLj3tLEcIVqAm6GHeIrC1EBeD/SNp GtYF0K0s59cRjn3JewNc+ZVOm3pRjHoB+TGAikDRt0XlzIdrZSziZLY/m8+VMbEwOME2 NioQ== 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; bh=SpvvFz1arHHUmo/9Hl752ZqIVITMtb0EULUgtmukwGQ=; b=McxfHsXInRu17zto9mYxXOmhj1hzlrwN0fCLfNELQQDhZcVO6yw0RDsWR4OJHXCgCA 0+w+sM+RNgmPSoZCOkPNxnwVuRAIQraE8p6Ce3Id0NlwjGJvQWpEV5gjwaLJXIdAVNgm X4xv3Hydc4WoEf11IwF4jvDPEjCubBrFh2aC94heM1zQ/GBBWEGXpISPa/n8oZ2kkwqu QKYUh69HJ47y2gI7tMER7QsJcJc09C9Yz7F/hIwv/BwRDKUJ1dMd+ruAscRu2ged/CTH /RSel8bFfSAe5bUaqwXoeMcKuzUcn7lNQBYK/3o5zzpXVw2vQEm7xjpro7S2ujV/39zK ujkQ== X-Gm-Message-State: AGi0PuZgoDJuupPaLV11eFHNo3LovirGvK17GbMODr0J05JzfOVOOiU9 1PzxLPZVPdi6IVbPgskpX2CCRscX X-Google-Smtp-Source: APiQypJESMAMkXuKmz+5bxcDqe96uXrT4av665LF0mPFtAyETvKQrQNC5BEHY7jeSHCvbKr86MiwnA== X-Received: by 2002:a17:90a:ee84:: with SMTP id i4mr12509005pjz.71.1588807216757; Wed, 06 May 2020 16:20:16 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n9sm5705688pjt.29.2020.05.06.16.20.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 May 2020 16:20:16 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 07:20:11 +0800 Message-Id: <1588807211-15105-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] avcodec/mpeg12enc: replace return -1 with 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/mpeg12enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 643ba81..f317c63 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -142,13 +142,13 @@ static av_cold int encode_init(AVCodecContext *avctx) MpegEncContext *s = avctx->priv_data; if (ff_mpv_encode_init(avctx) < 0) - return -1; + return AVERROR(EINVAL); if (find_frame_rate_index(s) < 0) { if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); - return -1; + return AVERROR(EINVAL); } else { av_log(avctx, AV_LOG_INFO, "MPEG-1/2 does not support %d/%d fps, there may be AV sync issues\n", @@ -159,7 +159,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (avctx->profile == FF_PROFILE_UNKNOWN) { if (avctx->level != FF_LEVEL_UNKNOWN) { av_log(avctx, AV_LOG_ERROR, "Set profile and level\n"); - return -1; + return AVERROR(EINVAL); } /* Main or 4:2:2 */ avctx->profile = s->chroma_format == CHROMA_420 ? FF_PROFILE_MPEG2_MAIN : FF_PROFILE_MPEG2_422; @@ -175,7 +175,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (avctx->profile != FF_PROFILE_MPEG2_HIGH && s->chroma_format != CHROMA_420) { av_log(avctx, AV_LOG_ERROR, "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n"); - return -1; + return AVERROR(EINVAL); } if (avctx->width <= 720 && avctx->height <= 576) avctx->level = 8; /* Main */ @@ -205,7 +205,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (s->drop_frame_timecode && s->frame_rate_index != 4) { av_log(avctx, AV_LOG_ERROR, "Drop frame time code only allowed with 1001/30000 fps\n"); - return -1; + return AVERROR(EINVAL); } #if FF_API_PRIVATE_OPT