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 /libavcodec/flacdec.c | |
| 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>
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |