From patchwork Sat Sep 2 16:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4947 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1624380jao; Sat, 2 Sep 2017 09:23:36 -0700 (PDT) X-Received: by 10.223.170.79 with SMTP id q15mr2811093wrd.197.1504369416626; Sat, 02 Sep 2017 09:23:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504369416; cv=none; d=google.com; s=arc-20160816; b=yQC7gsYLtTCqMRrSMVJmETgy4EmjW4UHDNbAwwNoEkrKjHNXJBbSyOpEtyYiG2tyMy rk7Y0GMie6xSKOZxAbNp5xzTmxnNIFpR9MhKJmdFG5MKpGjMbe0f8Xgn2M8HtFWP3U54 AFG6IMxA9n4xMfhkhI89nQY0ET50+Hz3PTwXA94q8tKPSLtvuk7fbmFRYqcy5IDa7hWF GEsKAyw+8p6eZvSTBSCAA7G0K3MNDbb90z5FYE2dUhp8Ezd46ZWQEXcO8UltP/Qdnf00 PeJzH3Db2V0fB9uUjPUyJT62FE6uYxoIQu1OqWQrjqV7+oQpP0zHIrkmdg5kKYUyTmMy HVkw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=NVigGLKverU2SMsi3Fl3Dm/3i+nRfZLccwlhOT5XRrI=; b=V5BMJnaScj3Mvbt0FLklrRwD4wb5HiCQREdDYhGdA+/BNI+f+pKtGtFawrWESmA9Om iVcVFL/J/M0EzHKySoj/72jsJJl9bYqTY9SqcWIZxH3cVORh9SlBX8aM/Elh65lJY526 /5cXSrVky+/3g3pa+W25YBno6styGSuJqW8uK97bcj5J4XWo5IeqZPG5CwodtRR/OVS2 bOPaz1vJwSCQZL28i513BAWRU51b3sKOk/LPcgE3eUgfAFUEY5ED7oMiL6cxGFxcBpga BLitAczN0HUZy2bn2sQV26oieXeM4mg8ryfldSJnu/7YRhQRFh/E/lUt28INcOTykbrL PAaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WZ4Tj5lS; 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=NONE 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 p101si2097836wrb.392.2017.09.02.09.23.35; Sat, 02 Sep 2017 09:23:36 -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=@gmail.com header.s=20161025 header.b=WZ4Tj5lS; 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=NONE 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 8F573689B7D; Sat, 2 Sep 2017 19:23:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AFAB689A8B for ; Sat, 2 Sep 2017 19:23:26 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id o63so2004364qkb.5 for ; Sat, 02 Sep 2017 09:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=taMMalH3z7OK/gf/o3/SiSq8vPR4rFY/2epeGKiqpJM=; b=WZ4Tj5lS76vJ7rWtZJ/ApQkPBl1oNzcJOslSdv/HIQvukIzIJinXw2+QSy8pCyBLED i05VUGcvkpYeN7ExzzRY/L+4Y0nk5Y2OihSsqVMDvpUJMjKy/aoa1HkuV4h2kRyfWHlg 3Q9G8701/mCVcFqyNBIIjSCcGlAMckKYkWsC2pfo8KXUUORE9V2f6lFojUCUfPxAW85Y k4xPX2bbz8QW5L1fzhXjcPMER0jmVHyhO7cW1ZcV93T8X0odTQSBHYo4w4V7cdjN4RPn A/NZ6NWWcvBp7eWOyMAnEQ+RYmHpZ+DTjjIbdQnTHk52lEdWkn71bpqqBreZHhdCn2Ge qqLA== 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; bh=taMMalH3z7OK/gf/o3/SiSq8vPR4rFY/2epeGKiqpJM=; b=rWsw3HlN+ZWogtgh/biBIpwiET49iLvGdtiM2xHQ1KPQqBi8F5d0ZneyNX2td2Vgi+ r+WUSkFwYywWK1XWtGiiTxViKsrwGn/SJjeetzGszu9+5TFKN3zAS8m+KJ/SRHHITwZn IwOGmMkdlOsVh+sr5oMHUIyu7JNgITGuFoSPSGb7Tw1aX+9A/X5Kk/ScKXlWT0K3VHR6 fPQExRV93qfCPnWBGmHcTbz7eqJicNfUpc/yfZsVQva40Kzjt6O4QaKro67UHzPPCPTc NiUL+AGgd2rjj0lYq7eMPN9wnj8GIm1XslknMKjfoReyKeObpl1yfuEGEeh64sleV6ww 13wA== X-Gm-Message-State: AHPjjUh0iFbAD1Q2/6T56QJ0tVJFOEnRZ9X10VjxHp+8SoZaR4Buhn+i RasGOgF9tgEtPePz X-Google-Smtp-Source: ADKCNb6LIdglmhdmRtTfOzz5YFMAUr8gPhDslS55tuH645pluZH1Eyvdwo22tKpKahzlrSOdtju1ZA== X-Received: by 10.55.197.21 with SMTP id p21mr7114094qki.281.1504369405881; Sat, 02 Sep 2017 09:23:25 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id q203sm1056938qke.27.2017.09.02.09.23.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Sep 2017 09:23:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2017 13:23:06 -0300 Message-Id: <20170902162306.7788-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] Bump major versions of all libraries 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" From: Vittorio Giovara This disables almost everything that was deprecated at least two years ago Readjust the minimum API version as needed, postponing any API-incompatible changes until the next bump. (cherry picked from commit 07a2b155949eb267cdfc7805f42c7b3375f9c7c5) Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- This depends on "[RFC] avcodec: add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL flag" and is meant to be applied after release 3.4 is branched off from master, as requested by both Michael and Marton. This patch does not include the cleaning that will come afterwards, like removing all the dead code inside the disabled FF_API_ wrappers. Those commits will be cherry-picked or authored as needed later. Three API deprecated ~2 years ago or more are also postponed here for varying reasons. FF_API_LOWRES: Since this functionality depends on AVStream->codec, i figure the two can be removed at the same time in the next bump or so. FF_API_AVCTX_TIMEBASE: Couldn't get this one to work. Not just libavcodec but apparently also libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for decoding. Upon removal some tests report a different generic stream time base (like 1/25), and others lose packet duration values. I guess it's somehow tied to the AVStream->codec clusterfuck. Help would be very welcome on removing this one. Otherwise it can be dealt with alongside AVStream->codec in the next bump. FF_API_OLD_FILTER_OPTS_ERROR: This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed. Its purpose is displaying the corrected command line using the new syntax as a suggestion as part of the error message. Please, do not report command lines using the old syntax suddenly not working. Notes: I have no way to test what effect the removal of XVMC truly has. The decoders are removed but unlike libav we have hwaccels that are not removed by this. Similarly, the pixfmt is also not removed in our case. Commit dcc39ee10e82833ce24aa57926c00ffeb1948198 does a thorough removal of the remnants of this functionality, but given the above i don't know if that applies to us the same way. I assume the hwaccels are meant to stay and work after this, so someone that knows this code and functionality and has a system where it can be tested should ideally look at this. After the bump there's a grace period of a month or so up to at most when the first post-bump release is tagged, to do the general ABI cleaning this allows us to. This includes but is not limited to: - Fixing field offsets of private fields in public structs by moving them to the end fo the struct (properly drawing the line where fields stop being public), or directly to internal structs. - Deprecating get/setters created because said offsets were out of whack, and removing their usage within the libraries. - Removing public enum value gaps that were missed during the last bump. - Removing usage of internal API in avpriv_ functions (GetBitContext especially), or altering said functions in whatever way may be needed. - Stop exposing internal API from libavformat. The latter includes the scheduled removal of ffserver, as resolved in last November's vote. A fixed version or even a full replacement working exclusively with public API can be introduced at any point afterwards, so please, lets not start a new fight like we had last November. Of course, if someone goes and fixes it inside the grace period then there will be no need to remove it at all. But that sounds kinda unfeasible considering nine months have passed since the vote and nobody even gave it a try. libavcodec/version.h | 20 ++++++++--------- libavdevice/version.h | 4 ++-- libavfilter/version.h | 8 +++---- libavformat/version.h | 18 ++++++++-------- libavresample/version.h | 4 ++-- libavutil/version.h | 16 +++++++------- libpostproc/version.h | 4 ++-- libswresample/version.h | 4 ++-- libswscale/version.h | 6 +++--- tests/ref/fate/api-mjpeg-codec-param | 42 ------------------------------------ tests/ref/fate/api-png-codec-param | 42 ------------------------------------ 11 files changed, 42 insertions(+), 126 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 29cdb85589..9f1543a6aa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,9 +27,9 @@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 104 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MAJOR 58 +#define LIBAVCODEC_VERSION_MINOR 0 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -64,7 +64,7 @@ #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_LOWRES -#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) #endif #ifndef FF_API_CAP_VDPAU #define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58) @@ -161,25 +161,25 @@ #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #endif #ifndef FF_API_MPV_OPT -#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_STREAM_CODEC_TAG -#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_QUANT_BIAS -#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_RC_STRATEGY -#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif #ifndef FF_API_MOTION_EST -#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_WITHOUT_PREFIX -#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_SIDEDATA_ONLY_PKT #define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) diff --git a/libavdevice/version.h b/libavdevice/version.h index 948e4e1e08..364404d65e 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -27,8 +27,8 @@ #include "libavutil/version.h" -#define LIBAVDEVICE_VERSION_MAJOR 57 -#define LIBAVDEVICE_VERSION_MINOR 8 +#define LIBAVDEVICE_VERSION_MAJOR 58 +#define LIBAVDEVICE_VERSION_MINOR 0 #define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ diff --git a/libavfilter/version.h b/libavfilter/version.h index 60f18f7c51..a350f47686 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" -#define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 101 +#define LIBAVFILTER_VERSION_MAJOR 7 +#define LIBAVFILTER_VERSION_MINOR 0 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -53,7 +53,7 @@ #define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 7) #endif #ifndef FF_API_OLD_FILTER_OPTS_ERROR -#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8) #endif #ifndef FF_API_AVFILTER_OPEN #define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7) @@ -68,7 +68,7 @@ #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #endif #ifndef FF_API_LAVR_OPTS -#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) #endif #endif /* AVFILTER_VERSION_H */ diff --git a/libavformat/version.h b/libavformat/version.h index 9cca76ee00..ed0439a26a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,8 +31,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here -#define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 81 +#define LIBAVFORMAT_VERSION_MAJOR 58 +#define LIBAVFORMAT_VERSION_MINOR 0 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -71,31 +71,31 @@ #define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58) #endif #ifndef FF_API_COMPUTE_PKT_FIELDS2 -#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif #ifndef FF_API_OLD_OPEN_CALLBACKS -#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif #ifndef FF_API_LAVF_AVCTX -#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif #ifndef FF_API_NOCONST_GET_SIDE_DATA #define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58) #endif #ifndef FF_API_HTTP_USER_AGENT -#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59) #endif #ifndef FF_API_HLS_WRAP -#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) #endif #ifndef FF_API_LAVF_MERGE_SD #define FF_API_LAVF_MERGE_SD (LIBAVFORMAT_VERSION_MAJOR < 58) #endif #ifndef FF_API_LAVF_KEEPSIDE_FLAG -#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59) #endif #ifndef FF_API_OLD_ROTATE_API -#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59) #endif diff --git a/libavresample/version.h b/libavresample/version.h index f6d99cba08..d5d3ea82b1 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -27,8 +27,8 @@ #include "libavutil/version.h" -#define LIBAVRESAMPLE_VERSION_MAJOR 3 -#define LIBAVRESAMPLE_VERSION_MINOR 6 +#define LIBAVRESAMPLE_VERSION_MAJOR 4 +#define LIBAVRESAMPLE_VERSION_MINOR 0 #define LIBAVRESAMPLE_VERSION_MICRO 0 #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ diff --git a/libavutil/version.h b/libavutil/version.h index 6e25b4690c..e9b8d0c37d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ -#define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 74 +#define LIBAVUTIL_VERSION_MAJOR 56 +#define LIBAVUTIL_VERSION_MINOR 0 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -119,25 +119,25 @@ #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) #endif #ifndef FF_API_VAAPI -#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57) #endif #ifndef FF_API_FRAME_QP -#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57) #endif #ifndef FF_API_PLUS1_MINUS1 -#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57) #endif #ifndef FF_API_ERROR_FRAME -#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57) #endif #ifndef FF_API_CRC_BIG_TABLE #define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56) #endif #ifndef FF_API_PKT_PTS -#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) #endif #ifndef FF_API_CRYPTO_SIZE_T -#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57) #endif diff --git a/libpostproc/version.h b/libpostproc/version.h index 3d7f8ea472..3ae75ff8b0 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -28,8 +28,8 @@ #include "libavutil/avutil.h" -#define LIBPOSTPROC_VERSION_MAJOR 54 -#define LIBPOSTPROC_VERSION_MINOR 6 +#define LIBPOSTPROC_VERSION_MAJOR 55 +#define LIBPOSTPROC_VERSION_MINOR 0 #define LIBPOSTPROC_VERSION_MICRO 100 #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \ diff --git a/libswresample/version.h b/libswresample/version.h index 379177a1f4..54dfd71e42 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -28,8 +28,8 @@ #include "libavutil/avutil.h" -#define LIBSWRESAMPLE_VERSION_MAJOR 2 -#define LIBSWRESAMPLE_VERSION_MINOR 8 +#define LIBSWRESAMPLE_VERSION_MAJOR 3 +#define LIBSWRESAMPLE_VERSION_MINOR 0 #define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ diff --git a/libswscale/version.h b/libswscale/version.h index dcf7959b23..9c24122031 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -26,9 +26,9 @@ #include "libavutil/version.h" -#define LIBSWSCALE_VERSION_MAJOR 4 -#define LIBSWSCALE_VERSION_MINOR 7 -#define LIBSWSCALE_VERSION_MICRO 103 +#define LIBSWSCALE_VERSION_MAJOR 5 +#define LIBSWSCALE_VERSION_MINOR 0 +#define LIBSWSCALE_VERSION_MICRO 100 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ diff --git a/tests/ref/fate/api-mjpeg-codec-param b/tests/ref/fate/api-mjpeg-codec-param index 6a5d4d3926..4803030c56 100644 --- a/tests/ref/fate/api-mjpeg-codec-param +++ b/tests/ref/fate/api-mjpeg-codec-param @@ -3,7 +3,6 @@ stream=0, decode=0 ab=0 bt=4000000 flags=0x00000000 - me_method=5 time_base=0/1 g=12 ar=0 @@ -18,7 +17,6 @@ stream=0, decode=0 qdiff=3 bf=0 b_qfactor=1.250000 - rc_strategy=0 b_strategy=0 ps=0 mv_bits=0 @@ -38,18 +36,12 @@ stream=0, decode=0 has_b_frames=0 block_align=0 mpeg_quant=0 - qsquish=0.000000 - rc_qmod_amp=0.000000 - rc_qmod_freq=0 rc_override_count=0 - rc_eq= maxrate=0 minrate=0 bufsize=0 - rc_buf_aggressivity=1.000000 i_qfactor=-0.800000 i_qoffset=0.000000 - rc_init_cplx=0.000000 dct=0 lumi_mask=0.000000 tcplx_mask=0.000000 @@ -64,7 +56,6 @@ stream=0, decode=0 aspect=180/180 sar=180/180 debug=0x00000000 - vismv=0x00000000 cmp=0 subcmp=0 mbcmp=0 @@ -75,27 +66,17 @@ stream=0, decode=0 precmp=0 pre_dia_size=0 subq=8 - dtg_active_format=0 me_range=0 - ibias=999999 - pbias=999999 global_quality=0 coder=0 context=0 slice_flags=0 - xvmc_acceleration=0 mbd=0 - stream_codec_tag=0 sc_threshold=0 - lmin=0 - lmax=0 nr=0 rc_init_occupancy=0 flags2=0x00000000 - error=0 threads=1 - me_threshold=0 - mb_threshold=0 dc=0 nssew=8 skip_top=0 @@ -107,7 +88,6 @@ stream=0, decode=0 skip_factor=0 skip_exp=0 skipcmp=13 - border_mask=0.000000 mblmin=236 mblmax=3658 mepc=256 @@ -120,7 +100,6 @@ stream=0, decode=0 refs=1 chromaoffset=0 trellis=0 - sc_factor=6 mv0_threshold=256 b_sensitivity=40 compression_level=-1 @@ -162,7 +141,6 @@ stream=0, decode=1 ab=0 bt=4000000 flags=0x00000000 - me_method=5 time_base=0/1 g=12 ar=0 @@ -177,7 +155,6 @@ stream=0, decode=1 qdiff=3 bf=0 b_qfactor=1.250000 - rc_strategy=0 b_strategy=0 ps=0 mv_bits=0 @@ -197,18 +174,12 @@ stream=0, decode=1 has_b_frames=0 block_align=0 mpeg_quant=0 - qsquish=0.000000 - rc_qmod_amp=0.000000 - rc_qmod_freq=0 rc_override_count=0 - rc_eq= maxrate=0 minrate=0 bufsize=0 - rc_buf_aggressivity=1.000000 i_qfactor=-0.800000 i_qoffset=0.000000 - rc_init_cplx=0.000000 dct=0 lumi_mask=0.000000 tcplx_mask=0.000000 @@ -223,7 +194,6 @@ stream=0, decode=1 aspect=180/180 sar=180/180 debug=0x00000000 - vismv=0x00000000 cmp=0 subcmp=0 mbcmp=0 @@ -234,27 +204,17 @@ stream=0, decode=1 precmp=0 pre_dia_size=0 subq=8 - dtg_active_format=0 me_range=0 - ibias=999999 - pbias=999999 global_quality=0 coder=0 context=0 slice_flags=0 - xvmc_acceleration=0 mbd=0 - stream_codec_tag=0 sc_threshold=0 - lmin=0 - lmax=0 nr=0 rc_init_occupancy=0 flags2=0x00000000 - error=0 threads=1 - me_threshold=0 - mb_threshold=0 dc=0 nssew=8 skip_top=0 @@ -266,7 +226,6 @@ stream=0, decode=1 skip_factor=0 skip_exp=0 skipcmp=13 - border_mask=0.000000 mblmin=236 mblmax=3658 mepc=256 @@ -279,7 +238,6 @@ stream=0, decode=1 refs=1 chromaoffset=0 trellis=0 - sc_factor=6 mv0_threshold=256 b_sensitivity=40 compression_level=-1 diff --git a/tests/ref/fate/api-png-codec-param b/tests/ref/fate/api-png-codec-param index c51957e1d2..dabe8154ee 100644 --- a/tests/ref/fate/api-png-codec-param +++ b/tests/ref/fate/api-png-codec-param @@ -3,7 +3,6 @@ stream=0, decode=0 ab=0 bt=4000000 flags=0x00000000 - me_method=5 time_base=0/1 g=12 ar=0 @@ -18,7 +17,6 @@ stream=0, decode=0 qdiff=3 bf=0 b_qfactor=1.250000 - rc_strategy=0 b_strategy=0 ps=0 mv_bits=0 @@ -38,18 +36,12 @@ stream=0, decode=0 has_b_frames=0 block_align=0 mpeg_quant=0 - qsquish=0.000000 - rc_qmod_amp=0.000000 - rc_qmod_freq=0 rc_override_count=0 - rc_eq= maxrate=0 minrate=0 bufsize=0 - rc_buf_aggressivity=1.000000 i_qfactor=-0.800000 i_qoffset=0.000000 - rc_init_cplx=0.000000 dct=0 lumi_mask=0.000000 tcplx_mask=0.000000 @@ -64,7 +56,6 @@ stream=0, decode=0 aspect=2835/2835 sar=2835/2835 debug=0x00000000 - vismv=0x00000000 cmp=0 subcmp=0 mbcmp=0 @@ -75,27 +66,17 @@ stream=0, decode=0 precmp=0 pre_dia_size=0 subq=8 - dtg_active_format=0 me_range=0 - ibias=999999 - pbias=999999 global_quality=0 coder=0 context=0 slice_flags=0 - xvmc_acceleration=0 mbd=0 - stream_codec_tag=0 sc_threshold=0 - lmin=0 - lmax=0 nr=0 rc_init_occupancy=0 flags2=0x00000000 - error=0 threads=1 - me_threshold=0 - mb_threshold=0 dc=0 nssew=8 skip_top=0 @@ -107,7 +88,6 @@ stream=0, decode=0 skip_factor=0 skip_exp=0 skipcmp=13 - border_mask=0.000000 mblmin=236 mblmax=3658 mepc=256 @@ -120,7 +100,6 @@ stream=0, decode=0 refs=1 chromaoffset=0 trellis=0 - sc_factor=6 mv0_threshold=256 b_sensitivity=40 compression_level=-1 @@ -162,7 +141,6 @@ stream=0, decode=1 ab=0 bt=4000000 flags=0x00000000 - me_method=5 time_base=0/1 g=12 ar=0 @@ -177,7 +155,6 @@ stream=0, decode=1 qdiff=3 bf=0 b_qfactor=1.250000 - rc_strategy=0 b_strategy=0 ps=0 mv_bits=0 @@ -197,18 +174,12 @@ stream=0, decode=1 has_b_frames=0 block_align=0 mpeg_quant=0 - qsquish=0.000000 - rc_qmod_amp=0.000000 - rc_qmod_freq=0 rc_override_count=0 - rc_eq= maxrate=0 minrate=0 bufsize=0 - rc_buf_aggressivity=1.000000 i_qfactor=-0.800000 i_qoffset=0.000000 - rc_init_cplx=0.000000 dct=0 lumi_mask=0.000000 tcplx_mask=0.000000 @@ -223,7 +194,6 @@ stream=0, decode=1 aspect=2835/2835 sar=2835/2835 debug=0x00000000 - vismv=0x00000000 cmp=0 subcmp=0 mbcmp=0 @@ -234,27 +204,17 @@ stream=0, decode=1 precmp=0 pre_dia_size=0 subq=8 - dtg_active_format=0 me_range=0 - ibias=999999 - pbias=999999 global_quality=0 coder=0 context=0 slice_flags=0 - xvmc_acceleration=0 mbd=0 - stream_codec_tag=0 sc_threshold=0 - lmin=0 - lmax=0 nr=0 rc_init_occupancy=0 flags2=0x00000000 - error=0 threads=1 - me_threshold=0 - mb_threshold=0 dc=0 nssew=8 skip_top=0 @@ -266,7 +226,6 @@ stream=0, decode=1 skip_factor=0 skip_exp=0 skipcmp=13 - border_mask=0.000000 mblmin=236 mblmax=3658 mepc=256 @@ -279,7 +238,6 @@ stream=0, decode=1 refs=1 chromaoffset=0 trellis=0 - sc_factor=6 mv0_threshold=256 b_sensitivity=40 compression_level=-1