libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'	Michael Niedermayer	2014-06-19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block/fill_block off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	dsputil: Split clear_block/fill_block off into a separate context	Diego Biurrun	2014-06-18
\| \|
* \|	Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'	Michael Niedermayer	2014-04-05
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d': Remove a number of unnecessary dsputil.h #includes Conflicts: libavcodec/h264pred.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	Remove a number of unnecessary dsputil.h #includes	Diego Biurrun	2014-04-04
\| \|
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2014-03-23
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: lavc: drop ff_pixfmt_list_420 Conflicts: libavcodec/flvdec.c libavcodec/msmpeg4dec.c libavcodec/rv10.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	lavc: drop ff_pixfmt_list_420	Vittorio Giovara	2014-03-23
\| \|
* \|	Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'	Michael Niedermayer	2014-03-17
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	mpegvideo: move mpegvideo formats-related defines to mpegutils.h	Vittorio Giovara	2014-03-16
\| \|
* \|	avcodec/msmpeg4dec: initialize dir_ptr in error cases	Michael Niedermayer	2013-12-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes use of uinitialized memory Fixes: msan_uninit-mem_7f01b8799186_7278_msnaudio.asf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	avcodec/msmpeg4dec: print error in case of invalid vlc in msmpeg4_decode_dc ↵	Michael Niedermayer	2013-12-15
\| \| \| \| \| \| \| \| \| \| \| \|	for version <=2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'	Michael Niedermayer	2013-10-04
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	cosmetics: Group .name and .long_name together in codec/format declarations	Diego Biurrun	2013-10-03
\| \|
* \|	msmpeg4: ignore negative DC overflow	Michael Niedermayer	2013-04-09
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes second half of Ticket2414 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'	Michael Niedermayer	2013-03-28
\|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3': build: Remove configure-generated .config file on distclean msmpeg4: Split decoding related functions to a separate file Conflicts: Makefile libavcodec/Makefile libavcodec/msmpeg4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	msmpeg4: Split decoding related functions to a separate file	Martin Storsjö	2013-03-27
	This fixes standalone compilation of the msmpeg4v2, msmpeg4v3 and wmv2 encoders, that previously failed to link due to the decoder codepaths requiring error_resilience. Signed-off-by: Martin Storsjö <martin@martin.st>