[FFmpeg-cvslog] Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 14:17:34 2014 +0100| [cffd2713e9bb7f26147cb4d90bf0d35ceaf012cd] | committer: Michael Niedermayer

Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'

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

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

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