7 Commits

Author	SHA1	Message	Date
Michael Niedermayer	c137fdd778	Merge remote-tracking branch 'qatar/master' ... * qatar/master: swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support ac3enc: fix allocation of floating point samples. Conflicts: ffmpeg.c libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/snow.c libswscale/swscale.c libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2011-06-15 02:15:25 +02:00
Mans Rullgard	e897a633cd	ARM: factor some repetitive code into macros ... Signed-off-by: Mans Rullgard <mans@mansr.com>	2011-06-14 10:43:54 +01: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
Måns Rullgård	a7e7d40c2e	ARM: set size of asm functions in object files ... Originally committed as revision 22404 to svn://svn.ffmpeg.org/ffmpeg/trunk	2010-03-09 16:17:56 +00:00
Måns Rullgård	55c0e1e6d2	ARM: add ff_ prefix to lots of functions ... Originally committed as revision 20167 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-10-04 13:13:12 +00:00
Måns Rullgård	c61e40b728	ARM: use plain labels for pc-relative addressing ... Originally committed as revision 20152 to svn://svn.ffmpeg.org/ffmpeg/trunk	2009-10-02 23:11:03 +00:00
Måns Rullgård	a2fc0f6a6d	ARM: replace "armv4l" with "arm" ... Originally committed as revision 16179 to svn://svn.ffmpeg.org/ffmpeg/trunk	2008-12-17 00:54:54 +00:00