[FFmpeg-cvslog] Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 13:54:03 2014 +0100| [cfef947f7f1f2520098e4e2763cf5ec2f7cc21c7] | committer: Michael Niedermayer

Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfef947f7f1f2520098e4e2763cf5ec2f7cc21c7
---