[FFmpeg-devel] [PATCH] avutil/opt: remove ABI hacks

[James Almer]

On 2/13/2018 12:12 AM, wm4 wrote:
> These were needed for ABI compatibility with Libav. We don't need them
> anymore.
> ---
> I'm assuming we're still sort of in the ABI unstable phase.

Sure, why not? We haven't tagged the first release of the current major
library versions yet, and it looks nicer this way.

> ---
>  libavutil/opt.h     | 18 +++++++++---------
>  libavutil/version.h |  2 +-
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/libavutil/opt.h b/libavutil/opt.h
> index 555929dd6b..391720f2e2 100644
> --- a/libavutil/opt.h
> +++ b/libavutil/opt.h
> @@ -229,15 +229,15 @@ enum AVOptionType{
>      AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
>      AV_OPT_TYPE_DICT,
>      AV_OPT_TYPE_UINT64,
> -    AV_OPT_TYPE_CONST = 128,
> -    AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers
> -    AV_OPT_TYPE_PIXEL_FMT  = MKBETAG('P','F','M','T'),
> -    AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'),
> -    AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational
> -    AV_OPT_TYPE_DURATION   = MKBETAG('D','U','R',' '),
> -    AV_OPT_TYPE_COLOR      = MKBETAG('C','O','L','R'),
> -    AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'),
> -    AV_OPT_TYPE_BOOL           = MKBETAG('B','O','O','L'),
> +    AV_OPT_TYPE_CONST,
> +    AV_OPT_TYPE_IMAGE_SIZE, ///< offset must point to two consecutive integers
> +    AV_OPT_TYPE_PIXEL_FMT,
> +    AV_OPT_TYPE_SAMPLE_FMT,
> +    AV_OPT_TYPE_VIDEO_RATE, ///< offset must point to AVRational
> +    AV_OPT_TYPE_DURATION,
> +    AV_OPT_TYPE_COLOR,
> +    AV_OPT_TYPE_CHANNEL_LAYOUT,
> +    AV_OPT_TYPE_BOOL,
>  };
>  
>  /**
> diff --git a/libavutil/version.h b/libavutil/version.h
> index d81ec6fa7b..a2a820aebf 100644
> --- a/libavutil/version.h
> +++ b/libavutil/version.h
> @@ -80,7 +80,7 @@
>  
>  #define LIBAVUTIL_VERSION_MAJOR  56
>  #define LIBAVUTIL_VERSION_MINOR   7
> -#define LIBAVUTIL_VERSION_MICRO 100
> +#define LIBAVUTIL_VERSION_MICRO 101
>  
>  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
>                                                 LIBAVUTIL_VERSION_MINOR, \
>