Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:33:27 +0000 (04:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:33:27 +0000 (04:33 +0200)
commit8543575cc4e270b2d53d00ed0d26140a9badc6bd
tree88c7944f94fb7a60f97550bb2affc528d9f7f05e
parent1f5e5d2205df568f86371660b0991ec7087e94e6
parent78f75b6fa421dd39a715588e9487579f1ce5bada
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@gmx.at>
configure
libavcodec/wavpack.c