Michael Niedermayer
53015bb3b3
Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'
...
* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
wvdec: split block header parsing into a separate file
Conflicts:
libavformat/Makefile
libavformat/wvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 10:07:30 +02:00
Michael Niedermayer
ad649e829d
Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'
...
* commit '0a1a94450a28eef854162f859e79ecfb9f97915b':
lavf: rename wv.c to wvdec.c
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 09:54:13 +02:00
Anton Khirnov
794ca87d2b
wvdec: split block header parsing into a separate file
...
It will be reused by other muxers and demuxers.
2013-05-28 17:47:59 +02:00
Anton Khirnov
0a1a94450a
lavf: rename wv.c to wvdec.c
...
wv.c will be used for shared wavpack functions.
2013-05-28 17:47:30 +02:00
