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)
commitcfef947f7f1f2520098e4e2763cf5ec2f7cc21c7
treebaec1bd8e97531a4a5b3c342c24e594367bac45c
parentb6a99563962c27380e14c6f725cc8f6ae9ee5d22
parentc070a8751597e3aa1b443e88464da785d8966b14
Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'

* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
  lavc: make avpriv_flac_parse_streaminfo() private on the next bump

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