1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavcodec/ppc
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
dsputil_altivec.c
dsputil_altivec.h
dsputil_ppc.c
fdct_altivec.c
fft_altivec_s.S
fft_altivec.c
float_altivec.c
fmtconvert_altivec.c
gmc_altivec.c
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
int_altivec.c
Makefile mpegaudiodsp: fix x86 and ppc makefiles 2011-05-19 16:32:24 +01:00
mathops.h
mpegaudiodec_altivec.c Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
mpegvideo_altivec.c
regs.h
types_altivec.h
util_altivec.h
vc1dsp_altivec.c
vp3dsp_altivec.c
vp8dsp_altivec.c