ffmpeg

Author	SHA1	Message	Date
Michael Niedermayer	c065255bba	Merge remote-tracking branch 'qatar/master' * 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>	2012-01-29 00:34:59 +01:00
Alex Converse	7181c4edee	cosmetics: Remove extra newlines at EOF	2012-01-27 17:19:09 -08:00
Mans Rullgard	2912e87a6c	Replace FFmpeg with Libav in licence headers Signed-off-by: Mans Rullgard <mans@mansr.com>	2011-03-19 13:33:20 +00:00
Luca Abeni	22c1f65fa6	Rename the RTP muxer sources so that the packetisation functions are in rtpenc_*.c files. Originally committed as revision 21284 to svn://svn.ffmpeg.org/ffmpeg/trunk	2010-01-18 13:44:12 +00:00