diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 14:17:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 14:17:46 +0100 |
| commit | cffd2713e9bb7f26147cb4d90bf0d35ceaf012cd (patch) | |
| tree | 29c86b5fcfc93af4f18197e50008f38d221adba3 | |
| parent | 94fe404c25f982f0fd28e9d63f0a7c7a29514bf6 (diff) | |
| parent | acc897e6b15776ed438b88ffe330ec48f6b50e48 (diff) | |
| download | ffmpeg-cffd2713e9bb7f26147cb4d90bf0d35ceaf012cd.tar.gz | |
Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'
* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
lavc: make avpriv_flac_is_extradata_valid() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/flac.c | 9 | ||||
| -rw-r--r-- | libavcodec/flac.h | 9 | ||||
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
3 files changed, 15 insertions, 5 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 diff --git a/libavcodec/flac.h b/libavcodec/flac.h index ee6d4b5234..f1307c7f50 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -102,6 +102,9 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, #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 /** @@ -111,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. */ -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. diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 920bb3da93..f1316658e7 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -102,7 +102,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) if (!avctx->extradata) return 0; - if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo)) + if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo)) return AVERROR_INVALIDDATA; /* initialize based on the demuxer-supplied streamdata header */ |