[FFmpeg-cvslog] Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 13:41:07 2014 +0100| [b6a99563962c27380e14c6f725cc8f6ae9ee5d22] | committer: Michael Niedermayer

Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'

* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
	libavcodec/Makefile

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

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