Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:49:30 +0000 (11:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:49:30 +0000 (11:49 +0200)
commit8012f93ed8afbf0b45fa378085cd4b000e30057f
treee8bc66eff6cdafb5e54eaabd069c97286e5c17d0
parentaa6cf4c1b050a387f99c1545a8f8029095da1cce
parent5074f4545c439420daebe4c2f28ed216440b6ec7
Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'

* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
  wavpack demuxer: export full wavpack blocks.

Conflicts:
libavformat/wv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wavpack.c
libavformat/wv.c