[FFmpeg-cvslog] Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 09:54:13 2013 +0200| [ad649e829d6af3409ea1bb2d45cc4e1310f3ba69] | committer: Michael Niedermayer

Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'

* commit '0a1a94450a28eef854162f859e79ecfb9f97915b':
  lavf: rename wv.c to wvdec.c

Conflicts:
	libavformat/Makefile

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

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