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

..

asm.S

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

dsputil_altivec.c

Merge remote branch 'qatar/master'

2011-05-11 05:47:02 +02:00

dsputil_altivec.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

dsputil_ppc.c

Merge remote branch 'qatar/master'

2011-05-11 05:47:02 +02:00

fdct_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

fft_altivec_s.S

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

fft_altivec.c

Merge remote branch 'qatar/master'

2011-04-13 02:49:22 +02:00

float_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

fmtconvert_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

gmc_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

h264_altivec.c

Merge remote-tracking branch 'qatar/master'

2011-06-15 02:15:25 +02:00

h264_template_altivec.c

Merge remote-tracking branch 'qatar/master'

2011-06-08 05:25:28 +02:00

idct_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

int_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

Makefile

mpegaudiodsp: fix x86 and ppc makefiles

2011-05-19 16:32:24 +01:00

mathops.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

mpegaudiodec_altivec.c

Merge remote-tracking branch 'qatar/master'

2011-05-20 05:48:22 +02:00

mpegvideo_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

regs.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

types_altivec.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

util_altivec.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vc1dsp_altivec.c

Merge remote branch 'qatar/master'

2011-05-05 03:30:24 +02:00

vp3dsp_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vp8dsp_altivec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00