-
Michael Niedermayer authored
* commit '78f75b6f': wavpack: extract sample rate from the bitstream configure: support gcc-4.8 instrumentation Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8543575c
* commit '78f75b6f': wavpack: extract sample rate from the bitstream configure: support gcc-4.8 instrumentation Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>