Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 07:54:13 +0000 (09:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 07:54:13 +0000 (09:54 +0200)
commitad649e829d6af3409ea1bb2d45cc4e1310f3ba69
treef6858b074b1cad3c1a549578206eac0757a782f6
parent7a2edcf1c8d46234406083b3a3fdb21cfa28d33e
parent0a1a94450a28eef854162f859e79ecfb9f97915b
Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'

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

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/wvdec.c