summaryrefslogtreecommitdiff
path: root/libavcodec/flac.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-06 14:17:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-06 14:17:46 +0100
commitcffd2713e9bb7f26147cb4d90bf0d35ceaf012cd (patch)
tree29c86b5fcfc93af4f18197e50008f38d221adba3 /libavcodec/flac.c
parent94fe404c25f982f0fd28e9d63f0a7c7a29514bf6 (diff)
parentacc897e6b15776ed438b88ffe330ec48f6b50e48 (diff)
Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'
* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48': lavc: make avpriv_flac_is_extradata_valid() private on the next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac.c')
-rw-r--r--libavcodec/flac.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 4bd4a013ef..5ff004e01b 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -166,7 +166,7 @@ int ff_flac_get_max_frame_size(int blocksize, int ch, int bps)
return count;
}
-int avpriv_flac_is_extradata_valid(AVCodecContext *avctx,
+int ff_flac_is_extradata_valid(AVCodecContext *avctx,
enum FLACExtradataFormat *format,
uint8_t **streaminfo_start)
{
@@ -242,4 +242,11 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
{
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