libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2012-01-29
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	cosmetics: Remove extra newlines at EOF	Alex Converse	2012-01-27
\| \|
\| *	Replace FFmpeg with Libav in licence headers	Mans Rullgard	2011-03-19
\|/ \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
*	More ID3v1 genres from ffmbc.	Michael Niedermayer	2009-12-13
\| \| \| \|	Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	ff_id3v1_genre_str table should be const.	Reimar Döffinger	2009-09-06
\| \| \| \|	Originally committed as revision 19781 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.	Patrick Dehne	2009-06-19
\| \| \| \| \| \|	patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.	Patrick Dehne	2009-06-11
	patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk