[FFmpeg-cvslog] Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 10:02:56 2013 +0200| [84051d57f54f061cfb7b3abe1be556d09e2d13fb] | committer: Michael Niedermayer

Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601'

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

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

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