[FFmpeg-cvslog] Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 04:33:27 2013 +0200| [8543575cc4e270b2d53d00ed0d26140a9badc6bd] | committer: Michael Niedermayer

Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'

* commit '78f75b6fa421dd39a715588e9487579f1ce5bada':
  wavpack: extract sample rate from the bitstream
  configure: support gcc-4.8 instrumentation

Conflicts:
	libavcodec/wavpack.c

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

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