From patchwork Tue Feb 13 04:33:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7579 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp612219jai; Mon, 12 Feb 2018 20:34:06 -0800 (PST) X-Google-Smtp-Source: AH8x225R8d3tKLpugSJSlNVCmM1pyuELSNOj3z7TSqdUeT0RAfIlGEEnEiI0W4NU25Mgc3SamFVa X-Received: by 10.223.142.105 with SMTP id n96mr10876998wrb.54.1518496446284; Mon, 12 Feb 2018 20:34:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518496446; cv=none; d=google.com; s=arc-20160816; b=fmyrlQrZOpdzk3zsEa7s8xK9rDSxms3aq3cswwNFmAj+RzyjZHQx3zboImPKyfds4I wbFx6zH0zam+ber09yqg+JAunBtdQbDZVsuh+QS1cwI58OptVxVqZjUr1O/3UdcJ53ag A4vSLBY3zFdKTvy2Yt764DmEoJC04g2bIDCMKI0trHbJbL7OWteYKDKH4fcF1tbMgTHk 1cw30pIQFIAwQfjHG8yjUxCK7rdv3q3AFVB6GZ5BY5q/wUsGYsr5Ajp1467yclgnCB89 d4NCnWJaROEPVZ8WMCEbd8G38VMP9xRt54m8OWLpODs7Ijn5NMyS1H7t/JEpH6gJ5RY2 8DVg== 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:cc: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=KfISj7BZC8eBRYUJD2PWSWW9UOjmBp/vWdf3MQnw8Ro=; b=FWiynLlTCX8mc0QdiIBc97dBb+HEDGg48DX6wKJOe68Dhlat9EEjAE8MyZDuRa9flg hNsDBeLRbB7r/cfM9SJnT+kt4PT/J4fEE2yUgEtot+t6Nkqq5cbSfji6zEDQLba4T5U2 sGdU3KnMHdHwMKvAo3dtgUAqGnWlSW9A3KEXmHkiMgCTV4AzLHqTtHVpiztQIZCK8tlb 4FlZxyrNX1+Vja8jsxKOMMPq1VK6vUo1AeXGEv77FQyPmwPLILaHO5PynUKl+GGcLto+ A9DP4Sm7IDlwMBDW2Mj9h4Xy7BMhEVJRY1ysZBijvd/k+8q4NbfFNvrPYgQtzfmsomPn VWgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=WjRLUCbu; 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 sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u1si282415wrd.74.2018.02.12.20.34.05; Mon, 12 Feb 2018 20:34:06 -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 header.s=20161025 header.b=WjRLUCbu; 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 sp=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 EABCB689BB7; Tue, 13 Feb 2018 06:33:52 +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 494A8688294 for ; Tue, 13 Feb 2018 06:33:46 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id i186so13365105wmi.4 for ; Mon, 12 Feb 2018 20:33:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=S9B/7wd1FYI1yLWKZmLNnsKYWCVppmNq/yYLyCM4SUA=; b=WjRLUCbuQReX2oRi62bHIYzns8KU4VQGnjuYcVW1+w+78H0SFSI8IvZ8Vru1YoRwhX QnDj/pTeETpxskUN8O/qks0UMIG3EKJyNsy39l2J+r7zhTZOx6+nqbDZXs9NtCYV+Ped 8hUQzVkY90W1lt+bZuxYPsRZyANfFqKDBJ1pGn41RxFGk6vBy+D9vs6i6Zs+uQOlYQ17 PYUSQCJ0jxRyxWtdcIw9gV7Mr4d5KCVSpKzuf7UT1aej8avLogS8H5bMDz7TBUUa1+8i PslTNi2CaoxkOV2zYLk+juZ73pGcArbC57D6jJqobghDsCE4neh6iSrWiN8Z1MQsZJxt 5bVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=S9B/7wd1FYI1yLWKZmLNnsKYWCVppmNq/yYLyCM4SUA=; b=mlszvalT9RFF6apunhJQlFzU6pcOWTAQmWusk+WtGVtEddtF/tcGYJGBgRxKNVRT2n kcKfSLQnZDN7yU5+AZuo0MJDOfA81CmW+KmnIVUGZBiw0EXUuWMk+AfbmpDinHGxD9zf 2bePsPShVHMoFFU+A0I2orbgYm7QqWu5yMfEqfF9OC/Dkllbg7Yz34/dg1ws09EHWdH2 NMngzSBWAPym5GXYPDRtEO31G4iuU5qITvLxNRkk1o+S1nwQGOnEegthmiz22UUuDhzo 97xY0I8bCBt854vyIhk4d4ArwszFaGtuomcL0JbN0gFlf/b8En5Jb2+u9MqaNDZripOf Zjow== X-Gm-Message-State: APf1xPAv/vmbC+7H438YchD+/twnKYqRRusQx6odmfYeRFUHeQ4yz8oQ CzmKsKF47/KaMSYN7UlucwgHpQ== X-Received: by 10.80.241.215 with SMTP id y23mr353161edl.71.1518496436434; Mon, 12 Feb 2018 20:33:56 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC803DC4C92685D2208F.dip0.t-ipconnect.de. [2003:6c:cd4e:dc80:3dc4:c926:85d2:208f]) by smtp.googlemail.com with ESMTPSA id a5sm6307078edm.38.2018.02.12.20.33.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 20:33:55 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2018 05:33:54 +0100 Message-Id: <20180213043354.7575-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avcodec: remove Libav ABI compatibility hacks 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 Cc: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- If anyone knows of similar still remaining cases in the codebase, please tell me, and I'll send patches. --- libavcodec/avcodec.h | 49 ++++++++++++++++--------------------------------- libavcodec/utils.c | 5 ----- libavcodec/version.h | 2 +- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bc0eacd66b..b3dad5d614 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -409,8 +409,7 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, - - AV_CODEC_ID_Y41P = 0x8000, + AV_CODEC_ID_Y41P, AV_CODEC_ID_AVRP, AV_CODEC_ID_012V, AV_CODEC_ID_AVUI, @@ -480,14 +479,11 @@ enum AVCodecID { AV_CODEC_ID_PCM_S24LE_PLANAR, AV_CODEC_ID_PCM_S32LE_PLANAR, AV_CODEC_ID_PCM_S16BE_PLANAR, - - AV_CODEC_ID_PCM_S64LE = 0x10800, + AV_CODEC_ID_PCM_S64LE, AV_CODEC_ID_PCM_S64BE, AV_CODEC_ID_PCM_F16LE, AV_CODEC_ID_PCM_F24LE, - - /* various ADPCM codecs */ - AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, + AV_CODEC_ID_ADPCM_IMA_QT, AV_CODEC_ID_ADPCM_IMA_WAV, AV_CODEC_ID_ADPCM_IMA_DK3, AV_CODEC_ID_ADPCM_IMA_DK4, @@ -518,8 +514,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_G722, AV_CODEC_ID_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_VIMA, - - AV_CODEC_ID_ADPCM_AFC = 0x11800, + AV_CODEC_ID_ADPCM_AFC, AV_CODEC_ID_ADPCM_IMA_OKI, AV_CODEC_ID_ADPCM_DTK, AV_CODEC_ID_ADPCM_IMA_RAD, @@ -529,26 +524,17 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_AICA, AV_CODEC_ID_ADPCM_IMA_DAT4, AV_CODEC_ID_ADPCM_MTAF, - - /* AMR */ - AV_CODEC_ID_AMR_NB = 0x12000, + AV_CODEC_ID_AMR_NB, AV_CODEC_ID_AMR_WB, - - /* RealAudio codecs*/ - AV_CODEC_ID_RA_144 = 0x13000, + AV_CODEC_ID_RA_144, AV_CODEC_ID_RA_288, - - /* various DPCM codecs */ - AV_CODEC_ID_ROQ_DPCM = 0x14000, + AV_CODEC_ID_ROQ_DPCM, AV_CODEC_ID_INTERPLAY_DPCM, AV_CODEC_ID_XAN_DPCM, AV_CODEC_ID_SOL_DPCM, - - AV_CODEC_ID_SDX2_DPCM = 0x14800, + AV_CODEC_ID_SDX2_DPCM, AV_CODEC_ID_GREMLIN_DPCM, - - /* audio codecs */ - AV_CODEC_ID_MP2 = 0x15000, + AV_CODEC_ID_MP2, AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 AV_CODEC_ID_AAC, AV_CODEC_ID_AC3, @@ -615,8 +601,7 @@ enum AVCodecID { AV_CODEC_ID_PAF_AUDIO, AV_CODEC_ID_ON2AVC, AV_CODEC_ID_DSS_SP, - - AV_CODEC_ID_FFWAVESYNTH = 0x15800, + AV_CODEC_ID_FFWAVESYNTH, AV_CODEC_ID_SONIC, AV_CODEC_ID_SONIC_LS, AV_CODEC_ID_EVRC, @@ -647,8 +632,7 @@ enum AVCodecID { AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT, AV_CODEC_ID_SRT, - - AV_CODEC_ID_MICRODVD = 0x17800, + AV_CODEC_ID_MICRODVD, AV_CODEC_ID_EIA_608, AV_CODEC_ID_JACOSUB, AV_CODEC_ID_SAMI, @@ -667,9 +651,8 @@ enum AVCodecID { /* other specific kind of codecs (generally used for attachments) */ AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. AV_CODEC_ID_TTF = 0x18000, - AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream. - AV_CODEC_ID_BINTEXT = 0x18800, + AV_CODEC_ID_BINTEXT, AV_CODEC_ID_XBIN, AV_CODEC_ID_IDF, AV_CODEC_ID_OTF, @@ -681,12 +664,12 @@ enum AVCodecID { AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it - AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS + AV_CODEC_ID_MPEG2TS, /**< _FAKE_ codec to indicate a raw MPEG-2 TS * stream (only used by libavformat) */ - AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems + AV_CODEC_ID_MPEG4SYSTEMS, /**< _FAKE_ codec to indicate a MPEG-4 Systems * stream (only used by libavformat) */ - AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. - AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket + AV_CODEC_ID_FFMETADATA, ///< Dummy codec for streams containing only metadata information. + AV_CODEC_ID_WRAPPED_AVFRAME, ///< Passthrough codec, AVFrames wrapped in AVPacket }; /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8c7d056da6..7dcfa0be71 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1386,11 +1386,6 @@ const char *avcodec_profile_name(enum AVCodecID codec_id, int profile) unsigned avcodec_version(void) { -// av_assert0(AV_CODEC_ID_V410==164); - av_assert0(AV_CODEC_ID_PCM_S8_PLANAR==65563); - av_assert0(AV_CODEC_ID_ADPCM_G722==69660); -// av_assert0(AV_CODEC_ID_BMV_AUDIO==86071); - av_assert0(AV_CODEC_ID_SRT==94216); av_assert0(LIBAVCODEC_VERSION_MICRO >= 100); return LIBAVCODEC_VERSION_INT; diff --git a/libavcodec/version.h b/libavcodec/version.h index d13dd41fa3..0ba6e6a164 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 11 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \