Merge commit '9325d88e'

* commit '9325d88e':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/adx.c

@@ -80,11 +80,3 @@ int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
     *header_size = offset;
     return 0;
 }
-
-#if LIBAVCODEC_VERSION_MAJOR < 56
-int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
-                             int bufsize, int *header_size, int *coeff)
-{
-    return ff_adx_decode_header(avctx, buf, bufsize, header_size, coeff);
-}
-#endif

libavcodec/adx.h

@@ -77,9 +77,4 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff);
 int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
                          int bufsize, int *header_size, int *coeff);
 
-#if LIBAVCODEC_VERSION_MAJOR < 56
-int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
-                             int bufsize, int *header_size, int *coeff);
-#endif
-
 #endif /* AVCODEC_ADX_H */

libavcodec/dv_profile.c

@@ -328,18 +328,3 @@ const AVDVProfile *av_dv_codec_profile(int width, int height,
     return NULL;
 }
 
-#if LIBAVCODEC_VERSION_MAJOR < 56
-const AVDVProfile *avpriv_dv_frame_profile(const AVDVProfile *sys,
-                                         const uint8_t* frame, unsigned buf_size)
-{
-    return av_dv_frame_profile(sys, frame, buf_size);
-}
-
-const AVDVProfile *avpriv_dv_codec_profile(AVCodecContext *codec)
-{
-    if (codec->coded_width || codec->coded_height) {
-        return av_dv_codec_profile(codec->coded_width, codec->coded_height, codec->pix_fmt);
-    } else
-        return av_dv_codec_profile(codec->width, codec->height, codec->pix_fmt);
-}
-#endif

libavcodec/dv_profile.h

@@ -59,11 +59,6 @@ typedef struct AVDVProfile {
 
 const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys,
                                             const uint8_t* frame, unsigned buf_size);
-#if LIBAVCODEC_VERSION_MAJOR < 56
-const AVDVProfile *avpriv_dv_frame_profile(const AVDVProfile *sys,
-                                           const uint8_t* frame, unsigned buf_size);
-const AVDVProfile *avpriv_dv_codec_profile(AVCodecContext* codec);
-#endif
 
 /**
  * Get a DV profile for the provided compressed frame.

libavcodec/flac.c

@@ -235,11 +235,3 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
     skip_bits_long(&gb, 64); /* md5 sum */
     skip_bits_long(&gb, 64); /* md5 sum */
 }
-
-#if LIBAVCODEC_VERSION_MAJOR < 56
-void avpriv_flac_parse_block_header(const uint8_t *block_header,
-                                int *last, int *type, int *size)
-{
-    flac_parse_block_header(block_header, last, type, size);
-}
-#endif

libavcodec/flac.h

@@ -110,11 +110,6 @@ int avpriv_flac_is_extradata_valid(AVCodecContext *avctx,
                                    enum FLACExtradataFormat *format,
                                    uint8_t **streaminfo_start);
 
-#if LIBAVCODEC_VERSION_MAJOR < 56
-void avpriv_flac_parse_block_header(const uint8_t *block_header,
-                                    int *last, int *type, int *size);
-#endif
-
 /**
  * Calculate an estimate for the maximum frame size based on verbatim mode.
  * @param blocksize block size, in samples