Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 12:54:03 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 12:54:11 +0000 (13:54 +0100)
* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
  lavc: make avpriv_flac_parse_streaminfo() 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