[FFmpeg-devel] [PATCH 2/3] avcodec/flac: remove avpriv parsing API cruft
Hendrik Leppkes
h.leppkes at gmail.com
Sun Sep 6 11:08:09 CEST 2015
---
libavcodec/flac.c | 15 ---------------
libavcodec/flac.h | 8 --------
2 files changed, 23 deletions(-)
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 5ff004e..f5154b9 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 f1307c7..96d971c 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.
--
2.5.1.windows.1
More information about the ffmpeg-devel
mailing list