From patchwork Fri Feb 9 10:16:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 7533 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp590431jai; Fri, 9 Feb 2018 02:21:38 -0800 (PST) X-Google-Smtp-Source: AH8x225F2eeyxAr+pvrFWyWtzL9JZRYXLS2utuM9nUtHJ9ulDiIGeNvLBGlM3fTbBoFF944VaVLr X-Received: by 10.28.122.12 with SMTP id v12mr1480333wmc.66.1518171698163; Fri, 09 Feb 2018 02:21:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518171698; cv=none; d=google.com; s=arc-20160816; b=BpDYuCbiWRs0TAUtou4bz+PziiKL+A663q0t533MoWS8hGJTwVDCaVFHcjkAP+OoRs 14GsUYh2+zi93uYmQ+A919ej2b2yLls8vvpynveBW66LgYP/idJxpVVAG1Ba3Qq1PAKL yCuIJ+a9nTzz+Qvc/MT9CUD9+hkvZyjaA2iRzM0cCY4Zkn6v6xex894D87fxhZxd46UP CdXIOGHMjmn5LsZQWqrbtJtMY5vzUes2jTJWsLIKLI4/oPqTSGE89VSVhyGdhMqid2Sv dCe0GKLHS8USJAh/BTs9bpJFD7BwtUlUT1GvTRpERan3pBkdCtes4fXC4TgFMWALvisu 50TQ== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=88Mm+Zd19SESvzPgv+J3XWCapUxVSu9Odrj8N7puFkw=; b=SQ30VsNxj2aE3PVCA1OdMkDfOQVYDNqKxLjK8kUNeguCv7Wk27PaGoSlme+YMR1kM5 wKNdkE7ZlS6z69WFgGSuMJEDVaWbRU9I91Rw4B9FbDPM5CA84A/GHIUCyCHBzXKKj7ki Zwh3xnQnkXoRP8rLgGhxoUl5+N+L1u4WoipZQkT4d6q9dzDJD2aDFgbPO+M4BHS8TOvl PkLOEUto8GzXRYlL6QDctru0C0Byjwa+yHQLIVwUFYOmsL6zHkb+V3k5drUgn6xlg9Qv JWRfPK4st7OcSi2FYdQNbPJjRJezxbXPgWGKoi7qVIxGsAD+UrNqkjz/XEqyN5JttZtw +4DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Qjo24dOA; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j3si1308435wmb.84.2018.02.09.02.21.37; Fri, 09 Feb 2018 02:21:38 -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=@gmail.com header.s=20161025 header.b=Qjo24dOA; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 009FD689957; Fri, 9 Feb 2018 12:21:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C2D6689218 for ; Fri, 9 Feb 2018 12:21:20 +0200 (EET) Received: by mail-pl0-f65.google.com with SMTP id k8so1268420pli.8 for ; Fri, 09 Feb 2018 02:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3wObO5NHFayrMjxUy2z1pD6uwOTKZ8CsDBDWRIBpp2M=; b=Qjo24dOA1E8pkMTMkUXUCyAMuK+O9fHWr+m11fD2GWeSrxj6DbRiyrb+F6x9k4nwlz g3TiNZHze1uwFwHNWOI9gcKddwZbzqX49qEIDdedph983mbNl9i1UoAmucXESs0oU7LE dCsfh42Yk/BUiMJuXm4RCXQC47BYeCZQVUaNZpWpAxqku/csdKsp2LlE8Xhg5cFrdBXN 6eHEH0F4eyi5aQZseKK1c27Svvu2PSVoDYzp54j2r7Oxc5SzPJm4NI/cYxghe45DjhCJ j9KCjRMNmONCYZygp+SNewWkFmDjxzdrjdpzE8seJyOmwroFek6HcXJILrq6Y/qMk4NJ 2dxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3wObO5NHFayrMjxUy2z1pD6uwOTKZ8CsDBDWRIBpp2M=; b=B6AK2Xujbb/cYRnDuPH6NLhejo4cgIdvm6oKh0G82n9MkuawilReCke0zUhi/AiNmA Ndh3VP8LGDcCcvtPf2eXTX6u1LMG5/bE9Z/870AprhzpD/yF67EKvsw3H3lHEtbBkqxT KvVdBKSRb+/Hus8e1ueDv3pXs0nknOmyljoGuWFVAJYu2VKz/tdqnsyKgi+zoaB0KlR4 wYdXQUjFdlmqjZovS+iWFGGbshVyWiUucRxhosnbgTywzuOSJP9v9bq2m9enbp4weQJX AiHujAx9pCHan/PJ2Ao1fOCne8x7xHzO5C9+S6D/+Xr7o6tLlyFGqu9w1Qn72ZyPdKN0 XR6Q== X-Gm-Message-State: APf1xPBMfmNqG524fHIy6QYSzaUqlcb1p4aUA0NG1NSNaSyUSSYI2eR+ kqykdYp54ALSxPk4kEHexVeU4ekP X-Received: by 2002:a17:902:4a0c:: with SMTP id w12-v6mr2129878pld.17.1518171377121; Fri, 09 Feb 2018 02:16:17 -0800 (PST) Received: from localhost.localdomain ([114.124.179.109]) by smtp.gmail.com with ESMTPSA id p69sm5954816pfk.7.2018.02.09.02.16.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 02:16:16 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Feb 2018 17:16:03 +0700 Message-Id: <20180209101603.396-1-mfcc64@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180208014747.GC11251@michaelspb> References: <20180208014747.GC11251@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/format: temporarily use old next api 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" Should fix https://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225066.html Signed-off-by: Muhammad Faiz --- The actual problem is that av*next() and av*iterate() have different semantics: - av*next() iterate all formats+devices - av*iterate() iterate formats only. Is this the intended behaviour? libavformat/format.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/format.c b/libavformat/format.c index b8c5a90a92..75951938cf 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -52,7 +52,9 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, const char *mime_type) { AVOutputFormat *fmt = NULL, *fmt_found; +#if !FF_API_NEXT void *i = 0; +#endif int score_max, score; /* specific test for image sequences */ @@ -66,7 +68,13 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, /* Find the proper file type. */ fmt_found = NULL; score_max = 0; - while ((fmt = av_muxer_iterate(&i))) { +#if FF_API_NEXT +FF_DISABLE_DEPRECATION_WARNINGS + while ((fmt = av_oformat_next(fmt))) +#else + while ((fmt = av_muxer_iterate(&i))) +#endif + { score = 0; if (fmt->name && short_name && av_match_name(short_name, fmt->name)) score += 100; @@ -81,6 +89,9 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, fmt_found = fmt; } } +#if FF_API_NEXT +FF_ENABLE_DEPRECATION_WARNINGS +#endif return fmt_found; }