libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	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
\| \|
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2013-08-31
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: pcm_bluray: cosmetics Conflicts: libavcodec/pcm-bluray.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	pcm_bluray: cosmetics	Christian Schmidt	2013-08-31
\| \|
* \|	Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'	Michael Niedermayer	2013-08-31
\|/ \| \| \| \| \| \|	* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f': pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c	Christian Schmidt	2013-08-31
	The original idea was to collect PCM codecs that could appear in various MPEG streams in this file. Discussion in IRC lead to the conclusion that one codec per file would be better and stop the need for #ifdefs.