Avoid giving the same SONAME as the fork if ABI compatibility is not offered.
Not necessary for libpostproc and libswresample but done for consistency. Not done for libavresample. Signed-off-by: Nicolas George <geo...@nsup.org> --- libavcodec/flac.c | 2 +- libavcodec/flac.h | 2 +- libavcodec/version.h | 84 ++++++++++++++++++------------------- libavcodec/vorbis_parser.c | 2 +- libavcodec/vorbis_parser_internal.h | 2 +- libavdevice/version.h | 2 +- libavfilter/version.h | 14 +++---- libavformat/version.h | 12 +++--- libavutil/version.h | 16 +++---- libpostproc/version.h | 4 +- libswresample/version.h | 2 +- libswscale/version.h | 2 +- 12 files changed, 72 insertions(+), 72 deletions(-) Myself: > And by the way, if we decide to drop ABI compatibility, the mature thing to > do would be to avoid the SONAME conflict by changing the naming scheme. Here it is. > Not done for libavresample. Actually, we should probably just remove libswresample, since it is there only for compatibility. diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 5ff004e..b6a15fb 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -236,7 +236,7 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, skip_bits_long(&gb, 64); /* md5 sum */ } -#if LIBAVCODEC_VERSION_MAJOR < 57 +#if LIBAVCODEC_VERSION_MAJOR < 157 void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer) { diff --git a/libavcodec/flac.h b/libavcodec/flac.h index f1307c7..168ade7 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -99,7 +99,7 @@ typedef struct FLACFrameInfo { void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); -#if LIBAVCODEC_VERSION_MAJOR < 57 +#if LIBAVCODEC_VERSION_MAJOR < 157 void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, diff --git a/libavcodec/version.h b/libavcodec/version.h index 6d6ec6a..83ba3a9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 57 +#define LIBAVCODEC_VERSION_MAJOR 157 #define LIBAVCODEC_VERSION_MINOR 0 #define LIBAVCODEC_VERSION_MICRO 100 @@ -53,131 +53,131 @@ */ #ifndef FF_API_VIMA_DECODER -#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_AUDIO_CONVERT -#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT #endif #ifndef FF_API_MISSING_SAMPLE -#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_LOWRES -#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_CAP_VDPAU -#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_BUFS_VDPAU -#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_VOXWARE -#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_SET_DIMENSIONS -#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_DEBUG_MV -#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_AC_VLC -#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_OLD_MSMPEG4 -#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_ASPECT_EXTENDED -#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_ARCH_ALPHA -#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_ERROR_RATE -#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_QSCALE_TYPE -#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_MB_TYPE -#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_MAX_BFRAMES -#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_NEG_LINESIZES -#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_EMU_EDGE -#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_ARCH_SH4 -#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_ARCH_SPARC -#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_UNUSED_MEMBERS -#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_IDCT_XVIDMMX -#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_INPUT_PRESERVED -#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_NORMALIZE_AQP -#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_GMC -#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_MV0 -#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_CODEC_NAME -#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_AFD -#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_VISMV /* XXX: don't forget to drop the -vismv documentation */ -#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_AUDIOENC_DELAY -#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_VAAPI_CONTEXT -#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 158) #endif #ifndef FF_API_AVCTX_TIMEBASE -#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 159) #endif #ifndef FF_API_MPV_OPT -#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 159) #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 < 159) #endif #ifndef FF_API_QUANT_BIAS -#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 159) #endif #ifndef FF_API_RC_STRATEGY -#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 159) #endif #ifndef FF_API_CODED_FRAME -#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 159) #endif #ifndef FF_API_MOTION_EST -#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 159) #endif #ifndef FF_API_WITHOUT_PREFIX -#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 159) #endif #endif /* AVCODEC_VERSION_H */ diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index 8fa6d99..13a60ce 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -296,7 +296,7 @@ AVVorbisParseContext *av_vorbis_parse_init(const uint8_t *extradata, return s; } -#if LIBAVCODEC_VERSION_MAJOR < 57 +#if LIBAVCODEC_VERSION_MAJOR < 157 int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s) { return vorbis_parse_init(s, avctx->extradata, avctx->extradata_size); diff --git a/libavcodec/vorbis_parser_internal.h b/libavcodec/vorbis_parser_internal.h index 49481ee..d326580 100644 --- a/libavcodec/vorbis_parser_internal.h +++ b/libavcodec/vorbis_parser_internal.h @@ -43,7 +43,7 @@ struct AVVorbisParseContext { int prev_mask; ///< bitmask used to get the previous mode flag in each packet }; -#if LIBAVCODEC_VERSION_MAJOR < 57 +#if LIBAVCODEC_VERSION_MAJOR < 157 /** * Initialize the Vorbis parser using headers in the extradata. * diff --git a/libavdevice/version.h b/libavdevice/version.h index 45c9e8d..13ae7a1 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -27,7 +27,7 @@ #include "libavutil/version.h" -#define LIBAVDEVICE_VERSION_MAJOR 57 +#define LIBAVDEVICE_VERSION_MAJOR 157 #define LIBAVDEVICE_VERSION_MINOR 0 #define LIBAVDEVICE_VERSION_MICRO 100 diff --git a/libavfilter/version.h b/libavfilter/version.h index 5ef78dc..e808a57 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" -#define LIBAVFILTER_VERSION_MAJOR 6 +#define LIBAVFILTER_VERSION_MAJOR 106 #define LIBAVFILTER_VERSION_MINOR 0 #define LIBAVFILTER_VERSION_MICRO 100 @@ -50,22 +50,22 @@ */ #ifndef FF_API_OLD_FILTER_OPTS -#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 107) #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 < 107) #endif #ifndef FF_API_AVFILTER_OPEN -#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 107) #endif #ifndef FF_API_AVFILTER_INIT_FILTER -#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 107) #endif #ifndef FF_API_OLD_FILTER_REGISTER -#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 107) #endif #ifndef FF_API_NOCONST_GET_NAME -#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) +#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 107) #endif #endif /* AVFILTER_VERSION_H */ diff --git a/libavformat/version.h b/libavformat/version.h index 18be8b2..7a90ed3 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" -#define LIBAVFORMAT_VERSION_MAJOR 57 +#define LIBAVFORMAT_VERSION_MAJOR 157 #define LIBAVFORMAT_VERSION_MINOR 0 #define LIBAVFORMAT_VERSION_MICRO 100 @@ -54,19 +54,19 @@ * */ #ifndef FF_API_LAVF_BITEXACT -#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 158) #endif #ifndef FF_API_LAVF_FRAC -#define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 158) #endif #ifndef FF_API_LAVF_CODEC_TB -#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 158) #endif #ifndef FF_API_URL_FEOF -#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 158) #endif #ifndef FF_API_PROBESIZE_32 -#define FF_API_PROBESIZE_32 (LIBAVFORMAT_VERSION_MAJOR < 58) +#define FF_API_PROBESIZE_32 (LIBAVFORMAT_VERSION_MAJOR < 158) #endif #ifndef FF_API_R_FRAME_RATE diff --git a/libavutil/version.h b/libavutil/version.h index fac4a5d..d6ffa9e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -55,7 +55,7 @@ * @{ */ -#define LIBAVUTIL_VERSION_MAJOR 55 +#define LIBAVUTIL_VERSION_MAJOR 155 #define LIBAVUTIL_VERSION_MINOR 0 #define LIBAVUTIL_VERSION_MICRO 100 @@ -85,25 +85,25 @@ */ #ifndef FF_API_VDPAU -#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 156) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 156) #endif #ifndef FF_API_OPT_TYPE_METADATA -#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 156) #endif #ifndef FF_API_DLOG -#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 156) #endif #ifndef FF_API_CRYPTO_CONTEXT -#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 156) #endif #ifndef FF_API_VAAPI -#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 156) #endif #ifndef FF_API_FRAME_QP -#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56) +#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 156) #endif /** diff --git a/libpostproc/version.h b/libpostproc/version.h index db557a5..9ef5e09 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -28,7 +28,7 @@ #include "libavutil/avutil.h" -#define LIBPOSTPROC_VERSION_MAJOR 54 +#define LIBPOSTPROC_VERSION_MAJOR 154 #define LIBPOSTPROC_VERSION_MINOR 0 #define LIBPOSTPROC_VERSION_MICRO 100 @@ -43,7 +43,7 @@ #define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION) #ifndef FF_API_QP_TYPE -#define FF_API_QP_TYPE (LIBPOSTPROC_VERSION_MAJOR < 55) +#define FF_API_QP_TYPE (LIBPOSTPROC_VERSION_MAJOR <155) #endif #endif /* POSTPROC_POSTPROCESS_VERSION_H */ diff --git a/libswresample/version.h b/libswresample/version.h index 12b3282..8216d22 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -28,7 +28,7 @@ #include "libavutil/avutil.h" -#define LIBSWRESAMPLE_VERSION_MAJOR 2 +#define LIBSWRESAMPLE_VERSION_MAJOR 102 #define LIBSWRESAMPLE_VERSION_MINOR 0 #define LIBSWRESAMPLE_VERSION_MICRO 100 diff --git a/libswscale/version.h b/libswscale/version.h index 24908b8..21597b9 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -26,7 +26,7 @@ #include "libavutil/version.h" -#define LIBSWSCALE_VERSION_MAJOR 4 +#define LIBSWSCALE_VERSION_MAJOR 104 #define LIBSWSCALE_VERSION_MINOR 0 #define LIBSWSCALE_VERSION_MICRO 100 -- 2.5.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel