[FFmpeg-devel] [PATCH 22/24] avformat/version_major: postpone some deprecations until the next bump

[Andreas Rheinhardt]

James Almer:
> They are either too recent, or are not trivial to remove.
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavformat/version_major.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavformat/version_major.h b/libavformat/version_major.h
> index 2c8ab84112..d87f91ea6d 100644
> --- a/libavformat/version_major.h
> +++ b/libavformat/version_major.h
> @@ -41,11 +41,11 @@
>   * at once through the bump. This improves the git bisect-ability of the change.
>   *
>   */
> -#define FF_API_COMPUTE_PKT_FIELDS2      (LIBAVFORMAT_VERSION_MAJOR < 61)
> -#define FF_API_AVIO_WRITE_NONCONST      (LIBAVFORMAT_VERSION_MAJOR < 61)
> -#define FF_API_LAVF_SHORTEST            (LIBAVFORMAT_VERSION_MAJOR < 61)
> -#define FF_API_ALLOW_FLUSH              (LIBAVFORMAT_VERSION_MAJOR < 61)
> -#define FF_API_AVSTREAM_SIDE_DATA       (LIBAVFORMAT_VERSION_MAJOR < 61)
> +#define FF_API_COMPUTE_PKT_FIELDS2      (LIBAVFORMAT_VERSION_MAJOR < 62)
> +#define FF_API_AVIO_WRITE_NONCONST      (LIBAVFORMAT_VERSION_MAJOR < 62)
> +#define FF_API_LAVF_SHORTEST            (LIBAVFORMAT_VERSION_MAJOR < 62)
> +#define FF_API_ALLOW_FLUSH              (LIBAVFORMAT_VERSION_MAJOR < 62)
> +#define FF_API_AVSTREAM_SIDE_DATA       (LIBAVFORMAT_VERSION_MAJOR < 62)
>  
>  
>  #define FF_API_R_FRAME_RATE            1

I disagree about FF_API_AVIO_WRITE_NONCONST: It is a simple
constification so that all changes required by our users are
no-brainers; and postponing the inevitable won't make the changes any
simpler.
More importantly, 2a68d94 actually announced that the change would
happen at the next major bump, i.e. users who wanted to be
forward-compatible were allowed to check for LIBAVFORMAT_VERSION_MAJOR < 61.

- Andreas