repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
flac.h
diff --git
a/ffmpeg/libavcodec/flac.h
b/ffmpeg/libavcodec/flac.h
index d85195fff00be4f9e4c957cf6564221a3ffb8d5f..f1307c7f5079af831409c28fd80645ff1cbbeab4 100644
(file)
--- a/
ffmpeg/libavcodec/flac.h
+++ b/
ffmpeg/libavcodec/flac.h
@@
-96,8
+96,16
@@
typedef struct FLACFrameInfo {
* @param[out] s where parsed information is stored
* @param[in] buffer pointer to start of 34-byte streaminfo data
*/
* @param[out] s where parsed information is stored
* @param[in] buffer pointer to start of 34-byte streaminfo data
*/
+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);
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.
/**
* Validate the FLAC extradata.
@@
-106,9
+114,9
@@
void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
* @param[out] streaminfo_start pointer to start of 34-byte STREAMINFO data.
* @return 1 if valid, 0 if not valid.
*/
* @param[out] streaminfo_start pointer to start of 34-byte STREAMINFO data.
* @return 1 if valid, 0 if not valid.
*/
-int
avpriv
_flac_is_extradata_valid(AVCodecContext *avctx,
-
enum FLACExtradataFormat *format,
-
uint8_t **streaminfo_start);
+int
ff
_flac_is_extradata_valid(AVCodecContext *avctx,
+ enum FLACExtradataFormat *format,
+ uint8_t **streaminfo_start);
/**
* Calculate an estimate for the maximum frame size based on verbatim mode.
/**
* Calculate an estimate for the maximum frame size based on verbatim mode.