Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'

[ffmpeg] / libavcodec / flac.c

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 5ff004e01b2761303e6f9f0aed9f8674fbebe4c5..f5154b9149dd9362975a2318ded553e270d3500d 100644 (file)
--- 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