From patchwork Mon Nov 7 00:21:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1322 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp874644vsb; Sun, 6 Nov 2016 16:21:12 -0800 (PST) X-Received: by 10.195.6.11 with SMTP id cq11mr3162975wjd.170.1478478072037; Sun, 06 Nov 2016 16:21:12 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x70si7701517wmf.147.2016.11.06.16.21.11; Sun, 06 Nov 2016 16:21:12 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD8AA68921D; Mon, 7 Nov 2016 02:21:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD4FD6891D0 for ; Mon, 7 Nov 2016 02:20:59 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id a20so3016298wme.2 for ; Sun, 06 Nov 2016 16:21:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=Rgc7mSM0ZJIWQqNvuBlyYtoDF0A4y0uzUnzOojcapI8=; b=z9aks09JDJGrcQxrU0keT+GwtbbRGS7fPOv4b2a6FNGOD0x5l/wAhVFE4gEY9W0APF gD4h6eIGOD9efOgWeK4bwsbnhyRzIlpLZLBXznbPGSF6zl8uXyLYBDScxNI+CJtvi+/r Hflrp+KJF9oJo/k4VpTxe3YJ/xO6HqAx5h0CJe0uY9vzxVg18HGKpdQYj46+IVE2IG+G /duAB28p2BjoZMMmQ5cp+AXjnM7unRUP12hN+qV5RE1zcpDjHyIVDd2CTnmuQ0VOyFj7 wi0Hrw5eNxhKrtVz4QmdxPNSN4/+yILn9NbBUc0F43t/y4R7k0+ypTbpuW9FfGl5Pr0i zqQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=Rgc7mSM0ZJIWQqNvuBlyYtoDF0A4y0uzUnzOojcapI8=; b=FVov9rtpOtyJHL1tVMaTy2ITK/1zeICTT20EeKhZguI+dblHQBvFFIN6C4zPrOPifC xqlgtDrjZob3CKYI4qiaZadQYw0vNeDFCaFM+inQj9N8SKk/Q06Scee/IQ2ElLJngknr QDpq7IfTQTQYqiXaIN0AuFDrNEXqS0HnB+oLq8d9I3hD66d+ZEZsQi8mu2Kfki8MRG7i KNOR6qo08cpRxED13jjbKv4zih5zHN7xXUoKZPoggxe2qjAkAmybUExfG1mP+oIorn6C 8IK0BJkPW8BEFClRaVPXOFAuTC5PXdGc8YTRNqHbzbR61q9SOx131tOr9IwEFSA8bfCt kBtw== X-Gm-Message-State: ABUngvcHLTERg37bhkSwjePIlo/e4ZAy0SR7O7njAuT+oY7tdbSiBDTl2kU7t2wVFiTjag== X-Received: by 10.28.105.76 with SMTP id e73mr4650743wmc.41.1478478062627; Sun, 06 Nov 2016 16:21:02 -0800 (PST) Received: from [192.168.2.21] (p5B072D05.dip0.t-ipconnect.de. [91.7.45.5]) by smtp.googlemail.com with ESMTPSA id u81sm10171113wmu.21.2016.11.06.16.21.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Nov 2016 16:21:01 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <46b7fb0a-63ef-03e2-adf7-ba7b85b23af2@googlemail.com> Date: Mon, 7 Nov 2016 01:21:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] mpegaudio_parser: don't return AVERROR_PATCHWELCOME 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The API does not allow returning AVERROR codes. It triggers an assert in av_parser_parse2. Signed-off-by: Andreas Cadhalpun --- libavcodec/mpegaudio_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 873f941..8c39825 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -98,7 +98,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, } else if (codec_id == AV_CODEC_ID_MP3ADU) { avpriv_report_missing_feature(avctx, "MP3ADU full parser"); - return AVERROR_PATCHWELCOME; + return 0; /* parsers must not return error codes */ } break;