ffmpeg

Commit Graph

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
Michael Niedermayer	57f36fda56	More ID3v1 genres from ffmbc. Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-12-13 20:51:38 +00:00
Reimar Döffinger	ed034f6c59	ff_id3v1_genre_str table should be const. Originally committed as revision 19781 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-09-06 08:39:41 +00:00
Patrick Dehne	50fcd5be36	Move id3v1/id3v2 handling code from mp3.c to id3v[12].c. patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-06-19 14:03:35 +00:00
Patrick Dehne	7541118286	Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c. patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-06-11 15:26:57 +00:00

7 Commits