From patchwork Sat Mar 31 23:24:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 8263 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1077665jad; Sat, 31 Mar 2018 16:24:53 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/AiVBrWb0/GGatNleB2XcyYoN9Abxjw7SC9fzHcGgU8pG7W8Ks+GK3TRrYWX5UKqTzkVUM X-Received: by 10.28.128.145 with SMTP id b139mr5222332wmd.62.1522538693456; Sat, 31 Mar 2018 16:24:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522538693; cv=none; d=google.com; s=arc-20160816; b=oEj06/VG4RbI00/24WZEFyi97NrihhdHktY7do0gCc3AJWf1eNj1l7ryblnu30bic7 VHw+vzuVYMV1AEYnY5C8qo47lUBmbOFA786IJ/RtcJxiZiTuR/YDiWIqOW8UCRRt5TJN 18xg46pllr3xfwms4/mEIzOeEH+IAnzQdKrjXCMlrZRbIuTdv51XJ72hRGCvgAGG/lx+ NHrNnWrGgfQ+c3x2l86tY8E1DsyxMHYLJaYsFC2c44kLe5Oskl2V6hx4/cgKCazL/Zw1 SogrGkp0LwZOJF9NC4a2ATYajkSBwug8+9Gmu/KGT/tMHzOqEcoOZOvP8Wn/t4FurDSt roRA== 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:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=4YGjinXPkZBzwH1nYAwNvzzO9BIhRpABYgtnGWIuIeU=; b=QI5rYdbPypyoscj/t6RbCafyWdfZmLi6cR1yt9wVgUnHym1nKsg36WpNAeqaLR5fjq 9EmKJLQggXUf9JIr+OXZkIC4Yczv4GiQFGd1owe0kp80aj/Uq3zQBbvDl9RBpk2wVBqh 8Qha7D0R/P6jMHUWrLr74m2uVOxE1CKTLmIK0Ptu56OI8K9lruRvDfGfJ6ocq6oNWJHD KPtuV3hBT+txCn1zIXa9D+9460CpnsUwWn+LYoj3gHyBZbVFIDqL+83tTyTGGOPM9+La w+1R9BkcHtRAo2WZJVOcOAUBajYKZMNLbqAOMZinlUvd0skReMt6QEcIP7XgqszVovgg FZ4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=1LogPyT1; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=kQ8dSu/r; 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 n4si8591005wri.384.2018.03.31.16.24.53; Sat, 31 Mar 2018 16:24:53 -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; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=1LogPyT1; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=kQ8dSu/r; 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 6A4366882DB; Sun, 1 Apr 2018 02:24:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC7B8680282 for ; Sun, 1 Apr 2018 02:24:17 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8350020A86 for ; Sat, 31 Mar 2018 19:24:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 31 Mar 2018 19:24:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=msypdUxljn2mSEnyE OD0XRAAR+gxB9LnJkmIsFcJWyY=; b=1LogPyT1aDPo3cXNcqTzZcjfFkm56yMXe YMln9UGclfA0AyDkY7EEQhPPvB/w4lLMF/6vKiT1ly2i/DN4oj8y6PkSBtGCAqP6 WWD0LMwBjLFoveLj7c6XY3+z2uTlMFHdKqAOj+tiZKGtpOCO3GQqimRgNKejXtSQ j0dc3Eagly4l1yQyEKLEm/0fIANmjbBtE7l8W/N8mpYBamvdWdZoZ6NK+Wd9967y 4woKnphwXnPWJDQ7b65TM9y+xwNLy160dcmYi769IFRtTCnlyUUmTFJ5bYS9hzOw XrL5++euU9Vy8r314aBN3Ef5KFaLusRKudQ+xsYMXIUTGfVA3faBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=msypdUxljn2mSEnyEOD0XRAAR+gxB9LnJkmIsFcJWyY=; b=kQ8dSu/r qktAdb5fDDQ1Zou7EHFXn4i+r0g2OngL1GQ7SatXSqI9U3cAh7vv9rWfsyUUdRHH xM+7DwYLvJpeQuf1qtpwTbHXp1RPtlK6+NRumMGkJcwTPZw30GRiOOlsoIWvTET6 69ozZqR2iWbjomLKlKG7UbJZ1rktkMnNnbEcDhFnVS150asr+W+DRYfm4tFR/qtL T7ESrP/AFDGH3m3z/sX0j2nCrtLWh5StQw0h5TAh+5L7Swr6Z/JYoWQ2QEaAofiP rzDulkwUeQxp2jpkNybAv3wC51B2aDC0D5Yz0OElv78fDAb+KyvrY5UitXFtTpeg GDdLq5qP0d4s6w== X-ME-Sender: Received: from localhost.localdomain (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 127A210251 for ; Sat, 31 Mar 2018 19:24:35 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Apr 2018 00:24:26 +0100 Message-Id: <20180331232428.89172-2-josh@itanimul.li> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180331232428.89172-1-josh@itanimul.li> References: <20180331232428.89172-1-josh@itanimul.li> Subject: [FFmpeg-devel] [PATCH 2/4] Revert "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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This reverts commit 909e00ae816df9b6a05b1c4d0cafb794d4d0ca28. There is no need to use the old API anymore as the new API now behaves in the same way (treating devices as formats when loaded). Signed-off-by: Josh de Kock --- libavformat/format.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavformat/format.c b/libavformat/format.c index 123f5faf6c..608af1b692 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -52,9 +52,7 @@ 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 */ @@ -68,13 +66,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, /* Find the proper file type. */ fmt_found = NULL; score_max = 0; -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS - while ((fmt = av_oformat_next(fmt))) -#else - while ((fmt = av_muxer_iterate(&i))) -#endif - { + while ((fmt = av_muxer_iterate(&i))) { score = 0; if (fmt->name && short_name && av_match_name(short_name, fmt->name)) score += 100; @@ -89,9 +81,6 @@ FF_DISABLE_DEPRECATION_WARNINGS fmt_found = fmt; } } -#if FF_API_NEXT -FF_ENABLE_DEPRECATION_WARNINGS -#endif return fmt_found; }