RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d' 

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

Conflicts:
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-10 02:09:13 +02:00
parent 329832d779 9325d88eba
commit a71fcfad89
6 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/adx.c
View File

@ -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

5
libavcodec/adx.h
View File

@ -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 */

15
libavcodec/dv_profile.c
View File

@ -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

5
libavcodec/dv_profile.h
View File

@ -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.

8
libavcodec/flac.c
View File

@ -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

5
libavcodec/flac.h
View File

@ -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