ffmpeg/libavcodec/x86
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
..
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
cavsdsp_mmx.c
dct32_sse.asm Merge remote-tracking branch 'qatar/master' 2011-05-24 04:35:08 +02:00
deinterlace.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-05-21 05:32:03 +02:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
fft_sse.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
fft.c Fix compilation with --disable-yasm. 2011-05-22 13:41:13 +02:00
fft.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2011-05-19 13:00:31 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2011-05-23 04:29:51 +02:00
h264_chromamc.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
h264_deblock.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264_i386.h Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
h264_idct_10bit.asm 4:4:4 H.264 decoding support 2011-06-13 21:16:30 -07:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2011-06-15 02:15:25 +02:00
h264_intrapred_10bit.asm Add x86 assembly for some 10-bit H.264 intra predict functions. 2011-06-06 01:31:02 +02:00
h264_intrapred_init.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
h264_qpel_mmx.c
h264_weight.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-02 05:12:10 +02:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
mpegvideo_mmx_template.c Merge remote branch 'qatar/master' 2011-04-30 01:58:26 +02:00
mpegvideo_mmx.c
png_mmx.c Fix add_paeth_prediction_mmx for rgb48 2011-04-27 20:08:37 +02:00
simple_idct_mmx.c
snowdsp_mmx.c
vc1dsp_mmx.c
vc1dsp_yasm.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
vp3dsp.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
vp8dsp-init.c
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
x86inc.asm Add support for a.out object format to assembler macros. 2011-05-20 17:52:21 +02:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2011-05-23 04:29:51 +02:00