Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 08:02:56 +0000 (10:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 08:03:04 +0000 (10:03 +0200)
commit84051d57f54f061cfb7b3abe1be556d09e2d13fb
tree28bd3176ee20ce2c31af71dbf3a5324c4040f5c6
parentbe72853f8aac459983739ad3a31ffad0ad7997cc
parenta7ec3a9a4eea4e374afcd6e05828b103e6fcb601
Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601'

* commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601':
  wavpack: drop redundant if/else blocks

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