Commit 9325d88e authored by Anton Khirnov's avatar Anton Khirnov

lavc: remove obsolete and disabled avpriv functions

parent 24c788f4
...@@ -80,11 +80,3 @@ int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, ...@@ -80,11 +80,3 @@ int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
*header_size = offset; *header_size = offset;
return 0; 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
...@@ -77,9 +77,4 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff); ...@@ -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 ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
int bufsize, int *header_size, int *coeff); 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 */ #endif /* AVCODEC_ADX_H */
...@@ -308,16 +308,3 @@ const AVDVProfile *av_dv_codec_profile(int width, int height, ...@@ -308,16 +308,3 @@ const AVDVProfile *av_dv_codec_profile(int width, int height,
return NULL; 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)
{
return av_dv_codec_profile(codec->width, codec->height, codec->pix_fmt);
}
#endif
...@@ -53,12 +53,6 @@ typedef struct AVDVProfile { ...@@ -53,12 +53,6 @@ typedef struct AVDVProfile {
const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */ const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */
} AVDVProfile; } AVDVProfile;
#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. * Get a DV profile for the provided compressed frame.
* *
......
...@@ -236,11 +236,3 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * ...@@ -236,11 +236,3 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
skip_bits_long(&gb, 64); /* md5 sum */ skip_bits_long(&gb, 64); /* md5 sum */
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
...@@ -110,11 +110,6 @@ int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, ...@@ -110,11 +110,6 @@ int avpriv_flac_is_extradata_valid(AVCodecContext *avctx,
enum FLACExtradataFormat *format, enum FLACExtradataFormat *format,
uint8_t **streaminfo_start); 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. * Calculate an estimate for the maximum frame size based on verbatim mode.
* @param blocksize block size, in samples * @param blocksize block size, in samples
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment