libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'	Michael Niedermayer	2014-03-22
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	avcodec: more correct printf specifiers	Diego Biurrun	2014-03-22
\| \|
* \|	Merge commit '56d061ce9da954560892e3551513d5ecc0439846'	Michael Niedermayer	2013-11-26
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '56d061ce9da954560892e3551513d5ecc0439846': metasound: add last missing modes (8kHz @ 6kbps per channel) Conflicts: Changelog doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	metasound: add last missing modes (8kHz @ 6kbps per channel)	Kostya Shishkov	2013-11-26
\| \| \| \| \| \| \| \|	Signed-off-by: Anton Khirnov <anton@khirnov.net>
* \|	Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'	Michael Niedermayer	2013-11-14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	twinvq: support multiple frames per packet	Kostya Shishkov	2013-11-14
\| \| \| \| \| \| \| \|	Signed-off-by: Diego Biurrun <diego@biurrun.de>
* \|	Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'	Michael Niedermayer	2013-11-14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ddb839e9286594ff7a862a956402106fca7055c9': metasound: add missing modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	metasound: add missing modes	Kostya Shishkov	2013-11-14
\| \| \| \| \| \| \| \|	Signed-off-by: Diego Biurrun <diego@biurrun.de>
* \|	Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'	Michael Niedermayer	2013-11-08
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45': metasound: Fix error message argument Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	metasound: Fix error message argument	Kostya Shishkov	2013-11-08
\| \| \| \| \| \| \| \|	Signed-off-by: Diego Biurrun <diego@biurrun.de>
* \|	metasound & twinvqdec: return the number of read bytes from read_bitstream	Michael Niedermayer	2013-10-25
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'	Michael Niedermayer	2013-08-26
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b': twinvq: set block align for codecs and use it in size checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	twinvq: set block align for codecs and use it in size checks	Kostya Shishkov	2013-08-26
\| \| \| \| \| \| \| \| \| \| \| \|	This both allows factoring out size check for both MetaSound and TwinVQ-VQF decoders and fixes the situation when there are several MetaSound frames stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).
* \|	Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'	Michael Niedermayer	2013-08-08
\|/ \| \| \| \| \| \| \| \| \| \| \|	* commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	Voxware MetaSound decoder	Kostya Shishkov	2013-08-08