[FFmpeg-devel] [PATCH 08/24] avcodec: remove deprecated FF_CODEC_CRYSTAL_HD

[Andreas Rheinhardt]

James Almer:
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  configure                  |  13 -
>  libavcodec/Makefile        |   1 -
>  libavcodec/allcodecs.c     |   6 -
>  libavcodec/avcodec.h       |  18 -
>  libavcodec/crystalhd.c     | 826 -------------------------------------
>  libavcodec/options_table.h |   3 -
>  libavcodec/version_major.h |   4 -
>  7 files changed, 871 deletions(-)
>  delete mode 100644 libavcodec/crystalhd.c

> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 3c2b0159a9..2306c0f7bf 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -794,24 +794,6 @@ typedef struct AVCodecContext {
>       */
>      float dark_masking;
>  
> -#if FF_API_SLICE_OFFSET
> -    /**
> -     * slice count
> -     * - encoding: Set by libavcodec.
> -     * - decoding: Set by user (or 0).
> -     */
> -    attribute_deprecated
> -    int slice_count;
> -
> -    /**
> -     * slice offsets in the frame in bytes
> -     * - encoding: Set/allocated by libavcodec.
> -     * - decoding: Set/allocated by user (or NULL).
> -     */
> -    attribute_deprecated
> -    int *slice_offset;
> -#endif
> -

The removal of FF_API_SLICE_OFFSET should be in its own commit.

>      /**
>       * sample aspect ratio (0 if unknown)
>       * That is the width of a pixel divided by the height of the pixel.

> diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h
> index 7e8f5bace3..d849d55cb2 100644
> --- a/libavcodec/version_major.h
> +++ b/libavcodec/version_major.h
> @@ -38,7 +38,6 @@
>   */
>  
>  #define FF_API_INIT_PACKET         (LIBAVCODEC_VERSION_MAJOR < 61)
> -#define FF_API_SLICE_OFFSET        (LIBAVCODEC_VERSION_MAJOR < 61)
>  #define FF_API_SUBFRAMES           (LIBAVCODEC_VERSION_MAJOR < 61)
>  #define FF_API_TICKS_PER_FRAME     (LIBAVCODEC_VERSION_MAJOR < 61)
>  #define FF_API_DROPCHANGED         (LIBAVCODEC_VERSION_MAJOR < 61)
> @@ -46,7 +45,4 @@
>  #define FF_API_AVFFT               (LIBAVCODEC_VERSION_MAJOR < 62)
>  #define FF_API_FF_PROFILE_LEVEL    (LIBAVCODEC_VERSION_MAJOR < 62)
>  
> -// reminder to remove CrystalHD decoders on next major bump
> -#define FF_CODEC_CRYSTAL_HD        (LIBAVCODEC_VERSION_MAJOR < 61)
> -
>  #endif /* AVCODEC_VERSION_MAJOR_H */