Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 13:17:34 +0000 (14:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 13:17:46 +0000 (14:17 +0100)
commitcffd2713e9bb7f26147cb4d90bf0d35ceaf012cd
tree29c86b5fcfc93af4f18197e50008f38d221adba3
parent94fe404c25f982f0fd28e9d63f0a7c7a29514bf6
parentacc897e6b15776ed438b88ffe330ec48f6b50e48
Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'

* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flac.c
libavcodec/flac.h
libavcodec/flacdec.c