From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 508BD4A0D1 for ; Wed, 20 Mar 2024 16:29:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D527A68D4AD; Wed, 20 Mar 2024 18:29:10 +0200 (EET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C546F68D2F1 for ; Wed, 20 Mar 2024 18:29:04 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4146f2bd5f1so27155e9.3 for ; Wed, 20 Mar 2024 09:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710952143; x=1711556943; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZUmM89nM/0JJfH7xmAdsNHmB8uPWJ0yEgpwVd1fPSKA=; b=U25jlAxlX6vNYpnGFuALUCxWus6ttVNQXX5B4R2tvDBTUjoVhvRqalNASV9SAKKVSl svWcK7QGIbFDh+2W/P/HLqsqZTPZeZo8jFEbDhKFIaQtP6mRl4OKx7b3CRNPMezVIXhj SGo7fKTzpyLuaQiErWtjHZ80uqhzj6JBMgyNJilMcheQyb/F5uxHPpezMGZDNm2BPIgx FlD4HzwCC7YxK1uOrytTkiUwXL+w4wPwk3HSppQnBd5XsNOM5IFtf+e69Rp28+dLfrWp iOmx28M0xPmPnzc8a0KyXA7FCgP5p5nwIEE2yhKMbTQHX2b/vV/Y5JZvTSnOFqa/fDdd w/bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710952143; x=1711556943; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZUmM89nM/0JJfH7xmAdsNHmB8uPWJ0yEgpwVd1fPSKA=; b=tStq1MCTZ6zNWAxlyTXeY/k07GnhtmjDhFTROoOGRNMNGYjRbxl2iJWDM5gx/FZ0vD oM506caub/EKpGWI02fgV8/bPo+jMYJ5lbKlr6w6fsRuZ48GO/b/WKBcV/VevdjnfvDg Shjc2cbI7kcdpJTVMmQI9HG06NynR0p37Gu4W3XOd3B/H2JVrh8fvHgUEdc/rX2xkk7F Wx1dAbLiFy2VLLWZ5nQDuie/vlnrdYQMKaDZ4FPd6d1sjPxsN0eIfCqr+WKecZ+lZz1V N8yHUWrWG8RqDFBPlRAH+1nLXof8t/icTuZytRkoQh642Chq6ZLWx2wxvFX5N68PY1t4 EWqA== X-Gm-Message-State: AOJu0Yx+Uu5XxyofeuWpcVPjM09mPUhdm8/zlccWPEWXA8f6M3cQH4+C +6qJd6NFT3lCqEqsPaezk+QHxiPYE6U31TpG2FkJ8KxsL7wSqxGXLEflfOob X-Google-Smtp-Source: AGHT+IEF/yF93UsMhKi+hnvU+S3Tbc9zWOtYNaMB4m8uM+gI/gOFZMMVIlY8nmtpKKuL3AeCVdyGOQ== X-Received: by 2002:a05:600c:3ca6:b0:413:2c4b:35d1 with SMTP id bg38-20020a05600c3ca600b004132c4b35d1mr2134825wmb.31.1710952143203; Wed, 20 Mar 2024 09:29:03 -0700 (PDT) Received: from mariano ([188.210.239.0]) by smtp.gmail.com with ESMTPSA id c21-20020a05600c0a5500b004146f728906sm736815wmq.7.2024.03.20.09.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:29:02 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 5656EBFCDC; Wed, 20 Mar 2024 17:29:01 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 17:29:01 +0100 Message-Id: <20240320162901.70879-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavf/gcfenc: return proper error codes in case of failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Stefano Sabatini Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/gxfenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 9ea24c2f27..0aea7bd7c2 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -692,7 +692,7 @@ static int gxf_write_header(AVFormatContext *s) if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { av_log(s, AV_LOG_ERROR, "gxf muxer does not support streamed output, patch welcome\n"); - return -1; + return AVERROR_PATCHWELCOME; } gxf->flags |= 0x00080000; /* material is simple clip */ @@ -707,15 +707,15 @@ static int gxf_write_header(AVFormatContext *s) if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE) { av_log(s, AV_LOG_ERROR, "only 16 BIT PCM LE allowed for now\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->sample_rate != 48000) { av_log(s, AV_LOG_ERROR, "only 48000hz sampling rate is allowed\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "only mono tracks are allowed\n"); - return -1; + return AVERROR(EINVAL); } ret = ff_stream_add_bitstream_filter(st, "pcm_rechunk", "n="AV_STRINGIFY(GXF_SAMPLES_PER_FRAME)); if (ret < 0) @@ -733,7 +733,7 @@ static int gxf_write_header(AVFormatContext *s) } else if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { if (i != 0) { av_log(s, AV_LOG_ERROR, "video stream must be the first track\n"); - return -1; + return AVERROR(EINVAL); } /* FIXME check from time_base ? */ if (st->codecpar->height == 480 || st->codecpar->height == 512) { /* NTSC or NTSC+VBI */ @@ -750,7 +750,7 @@ static int gxf_write_header(AVFormatContext *s) } else { av_log(s, AV_LOG_ERROR, "unsupported video resolution, " "gxf muxer only accepts PAL or NTSC resolutions currently\n"); - return -1; + return AVERROR(EINVAL); } if (!tcr) tcr = av_dict_get(st->metadata, "timecode", NULL, 0); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".