Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'

[ffmpeg] / libavcodec / flac.h

diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index f1307c7f5079af831409c28fd80645ff1cbbeab4..96d971c9d7efe9064a80377f76e6e45cbbfc98fa 100644 (file)
--- 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.