From patchwork Sat Sep 23 01:01:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5244 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp173891jaa; Fri, 22 Sep 2017 18:02:12 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCURvkZhXLOljipzL9oX3LadHFLhAMCjuOJLruaV/xPmgtyRL1h8/MtT3WQefrsc+8TtQ05 X-Received: by 10.223.131.65 with SMTP id 59mr641469wrd.137.1506128532764; Fri, 22 Sep 2017 18:02:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506128532; cv=none; d=google.com; s=arc-20160816; b=MhdqE7NzA2CzYWyy4Y4DnZXJ4FbA/0umD6XsQF1rXMw93fh/GtSfJNX4hrIizN8kua nUfso1QmNU2nfQrxJUS49mT8mApTKIhY7GA427kzBz7RMr1HmydkbiO9d4pU+ltDZ+So rufiNjDKg3/+kWGDBWtyYjdXOGTwvOafBKpbeun995gomdkalxweKvs9Zwb+crzZTPHZ 7dAHTEn8GgDcTp7wc2xCIWN8LsTcdnVEwoVULKMGm6hG4NzQRTingvILm4K1GuTtmECV 2f3B2Z8/HjJi7yvMrIsWmdpeSrAMOB6OAnyNtHMw68VFslaEv16ANuLQOocEaENOptF+ +BzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=qkcSi8mQDDYogZU20+jkWfBMVjU5uKMwaU3Sp8o0keE=; b=UPIG5bCoPEYvgMnkAlrZ89Qf2lWHP6zh2pID57o/GavwC6yB0VKaZI1osXcpRqayBo om1NC1tR4Sc3IdbEvZSJRXibD59fyZfghec8+br2F2NhIBnJmJFNOj+l7MDl5CGGciub E8a36cj3/B1eHr3wj4ppOqB/Pp1O1+HAi1JYR5QGkRvf/3Gnm29XjLKfQNo5gRQORnnN B+d7myz97bvcNjEa7RI8fdMSvClvn3buCQLMZiEx3/ig9GTkps5n0Gc7MvLmpVt4BbrW 70qa3p/ydtXorYduT5uX6O/thSa4vfZpUsPujUYvsaVCP5Xg2Z0KRHYlCZUOKWvcqtCg 6sBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h83si735768wmi.144.2017.09.22.18.02.11; Fri, 22 Sep 2017 18:02:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23AED680AC6; Sat, 23 Sep 2017 04:02:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58F3768040D for ; Sat, 23 Sep 2017 04:01:54 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dvYpY-0008Ro-BS for ffmpeg-devel@ffmpeg.org; Sat, 23 Sep 2017 03:02:04 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Cp1w1w00D0S5wYM01p1xCl; Sat, 23 Sep 2017 03:01:57 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 23 Sep 2017 03:01:54 +0200 Message-Id: <20170923010154.1663-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170923010154.1663-1-michael@niedermayer.cc> References: <20170923010154.1663-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/snowenc: Replace "return -1" by named constants 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: Michael Niedermayer --- libavcodec/snowenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index bb113d0a2b..f5497f958c 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -50,7 +50,7 @@ FF_ENABLE_DEPRECATION_WARNINGS && (avctx->flags & AV_CODEC_FLAG_QSCALE) && avctx->global_quality == 0){ av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with lossless mode.\n"); - return -1; + return AVERROR(EINVAL); } #if FF_API_MOTION_EST FF_DISABLE_DEPRECATION_WARNINGS @@ -107,8 +107,8 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(ENOMEM); } if((avctx->flags&AV_CODEC_FLAG_PASS2) || !(avctx->flags&AV_CODEC_FLAG_QSCALE)){ - if(ff_rate_control_init(&s->m) < 0) - return -1; + if((ret = ff_rate_control_init(&s->m)) < 0) + return ret; } s->pass1_rc= !(avctx->flags & (AV_CODEC_FLAG_QSCALE|AV_CODEC_FLAG_PASS2)); @@ -130,7 +130,7 @@ FF_ENABLE_DEPRECATION_WARNINGS break;*/ default: av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n"); - return -1; + return AVERROR_PATCHWELCOME; } avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift); @@ -833,7 +833,7 @@ static int encode_subband_c0run(SnowContext *s, SubBand *b, const IDWTELEM *src, for(y=0; yc.bytestream_end - s->c.bytestream < w*40){ av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); - return -1; + return AVERROR(ENOMEM); } for(x=0; x