From patchwork Wed Feb 7 12:14:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 7524 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp514146jai; Wed, 7 Feb 2018 04:14:25 -0800 (PST) X-Google-Smtp-Source: AH8x225RrJ4BgtdSC15SzbIloNmFwX480LDa9gIkqvfjSBoWvfIRTydK7anKa24BHwcFK143ObSz X-Received: by 10.28.18.144 with SMTP id 138mr4628694wms.19.1518005665062; Wed, 07 Feb 2018 04:14:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518005665; cv=none; d=google.com; s=arc-20160816; b=dZf9hcza4Oq0alMwLHZ7Bdzun83uuqlHR+ylykRe1xkN2NFu08zGj8b6ArteHeN/7K j4wrHI8IotYxKb7sFICLVsv19bY5oVXH0LcQBbr/JDXV8r6122tJhW76YT6zT7SaI3O0 f4tEoqLugJE6C2mP7JXPZi1h6DzjWIiOSIDjjIX/mws5adK5A/JvqeuDqC+Ow43WxSwU Jd+RTXngpph69deYGZcRYzeGkWipmrS9lbQD/tu2r8o0imWqfS6s7rZtGVwVcybYo6M1 XSqkTBu2UKYrse+YK9Rpzg2BpHLA/QLTfWLsvX39hXT0dKSakYTfSaCcnEYlfqEN5Qy0 AcDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:user-agent:content-disposition:mime-version :message-id:to:from:date:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=6jbDf5v50TODJKAdvpHR2e3M6kSzfKKdW6bFR0F/ZRk=; b=DJI3E/794+ZKLgoQzhEEIkO5aNC22tu6kwmfZ1DdSXRhgml55bNrd706Mfsc/Od29k ROzOyjV6vzPq1G5rN7cMB9YxjXD5MmZlkP+dn4w6WGeRsJbPYuwtyA0i2Yd7niYj9VbJ zj7K9o0fLZYvgmNGJdv5sBhjg8ZpQIqZ0BrNL8w5g0b3f7eErLnOpk3EsFppGXMLhTJ8 aG24MRIlKJA5Uw1yJeHw8KnnDFkR22rUjXjM7ra9L4F3cYqfKn0BifeWKkBz2/rTzLun mSxgzRcsO26k2pYi5rEFC/+eqmjLxqNHzd20T/HJC5H1J4jiBnyFUxrdCKMhSNEDsK2f 5jLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=0NEIROH2; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=VdZ6eEOO; 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 r2si1159425wmb.248.2018.02.07.04.14.24; Wed, 07 Feb 2018 04:14:25 -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=@itanimul.li header.s=fm1 header.b=0NEIROH2; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=VdZ6eEOO; 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 438C6688291; Wed, 7 Feb 2018 14:14:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73CF868038A for ; Wed, 7 Feb 2018 14:14:07 +0200 (EET) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5FB7620A08 for ; Wed, 7 Feb 2018 07:14:14 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Wed, 07 Feb 2018 07:14:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=UeyO4uj5ef8glFRF2 Uv6uwX2sGF+w9TpRzmCvVhodjQ=; b=0NEIROH2w+qwuoARhIRHe3FZPyIb3jvwT 9Xsp8SQOiIuFJjxWUKjFams2wpZd7GC0Y8j/QLTqWS4Uceo8PUnBiMV9MDVFdxCd rk7X7tue0ToCeaPf73GodTqvKiIAwY8rqJZfiOFe/QFo32z05SUJ9LARn/2li/U3 /N7P+hCsa0u/NQ3yUibvaUWIju1rEz6Esgpgdq6yiPFYK9VV4Rl9v15Xd+hz5PVr ooyIg2ojnORRHI7Ykl2ImaIq7k+7ZOlhmrI0gdWKwdT3wzzqGajbQmtOL8rNBBco o22xKVoH9maVBDowujBWw7xcuiipKyyTpZUKSHLyVTnLlFbpzYetA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=UeyO4uj5ef8glFRF2Uv6uwX2sGF+w9TpRzmCvVhodjQ=; b=VdZ6eEOO 1a5q7wuRQgKlUDBS6PgEij5V/EskS2o2fBA/uwwR7bzhkR/1GICXiBFyUdAOYMsH q1XG3A2SZdSQFtbLqgVPJsatC1JVaY19KIBoyHwPrBV8i3wAZb/iPm1rS0BG1Nxy VF33Xw3tw3eiCsL1R9XCLmfq15KKpZbgcaRqU9BtOO+12khb+Oo/z+ijYKhea76p gUHTwQ1flOsKE8lsBZJl7ONkvoCIV4KDHOtp0yj+vXYlMtm2T9U0Ojj1iGGEoXlL K7Lq1k91nlKxVxMJp1r+w2ykPWsujJDEYwono1+6Ig0Z8VhucTbYRMROdaq7Xov4 q5VlPM4V4u2Yqw== X-ME-Sender: Received: from tengokunosoto.local (barton.ac.uk [212.219.11.27]) by mail.messagingengine.com (Postfix) with ESMTPA id C2B647E2E5 for ; Wed, 7 Feb 2018 07:14:13 -0500 (EST) Date: Wed, 7 Feb 2018 12:14:44 +0000 From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Message-ID: <20180207121442.GA5624@tengokunosoto.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) Subject: [FFmpeg-devel] [PATCH] cmdutils: fix finding next codec for id 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" --- fftools/cmdutils.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 0b06ccc71a..8bb9952016 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1424,11 +1424,14 @@ static char get_media_type_char(enum AVMediaType type) static const AVCodec *next_codec_for_id(enum AVCodecID id, const AVCodec *prev, int encoder) { + const AVCodec *next = NULL; void *i = 0; - while ((prev = av_codec_iterate(&i))) { - if (prev->id == id && - (encoder ? av_codec_is_encoder(prev) : av_codec_is_decoder(prev))) - return prev; + + while ((next = av_codec_iterate(&i))) { + if (next->id == id && + (!prev || (strcmp(next->name, prev->name) > 0)) && + (encoder ? av_codec_is_encoder(next) : av_codec_is_decoder(next))) + return next; } return NULL; }