libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'	Michael Niedermayer	2013-05-29
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '794ca87d2bff2513118de8b97595b3e23070e67d': wvdec: split block header parsing into a separate file Conflicts: libavformat/Makefile libavformat/wvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	wvdec: split block header parsing into a separate file	Anton Khirnov	2013-05-28
\| \| \| \| \| \| \| \|	It will be reused by other muxers and demuxers.
* \|	Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'	Michael Niedermayer	2013-05-29
\|/ \| \| \| \| \| \| \| \| \|	* commit '0a1a94450a28eef854162f859e79ecfb9f97915b': lavf: rename wv.c to wvdec.c Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	lavf: rename wv.c to wvdec.c	Anton Khirnov	2013-05-28
	wv.c will be used for shared wavpack functions.