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)
* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump

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

Simple merge
Simple merge
Simple merge