diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-06 10:44:59 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-06 16:25:56 +0200 |
| commit | 2cad7eebc13f54d5526d8599d536aa8ffdaefe3b (patch) | |
| tree | 518f75e05b7fec3ec4d474092e0488eb938a6f9e | |
| parent | eb011f73ca2f7dc51576c5bd006004dcfc7dfb69 (diff) | |
| download | android_external_ffmpeg-2cad7eebc13f54d5526d8599d536aa8ffdaefe3b.tar.gz android_external_ffmpeg-2cad7eebc13f54d5526d8599d536aa8ffdaefe3b.tar.bz2 android_external_ffmpeg-2cad7eebc13f54d5526d8599d536aa8ffdaefe3b.zip | |
avcodec/flac: remove avpriv parsing API cruft
| -rw-r--r-- | libavcodec/flac.c | 15 | ||||
| -rw-r--r-- | libavcodec/flac.h | 8 |
2 files changed, 0 insertions, 23 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 5ff004e01b..f5154b9149 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -235,18 +235,3 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, skip_bits_long(&gb, 64); /* md5 sum */ skip_bits_long(&gb, 64); /* md5 sum */ } - -#if LIBAVCODEC_VERSION_MAJOR < 57 -void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, - const uint8_t *buffer) -{ - ff_flac_parse_streaminfo(avctx, s, buffer); -} - -int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, - enum FLACExtradataFormat *format, - uint8_t **streaminfo_start) -{ - return ff_flac_is_extradata_valid(avctx, format, streaminfo_start); -} -#endif diff --git a/libavcodec/flac.h b/libavcodec/flac.h index f1307c7f50..96d971c9d7 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -99,14 +99,6 @@ typedef struct FLACFrameInfo { void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); -#if LIBAVCODEC_VERSION_MAJOR < 57 -void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, - const uint8_t *buffer); -int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, - enum FLACExtradataFormat *format, - uint8_t **streaminfo_start); -#endif - /** * Validate the FLAC extradata. * @param[in] avctx codec context containing the extradata. |