Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jun 2011 00:15:25 +0000 (02:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jun 2011 00:15:25 +0000 (02:15 +0200)
commitc137fdd778e1bb82c2f0d7fa4a88adc97058d6d4
tree6ba8284ec414ae9cc98d70a80fcb81a719d66272
parent9e2f448d68d9df7ad79d968db315c6b0cc79c4df
parent4e0583020567dd2062a908fe59aacba484e68049
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>
25 files changed:
Makefile
common.mak
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/mpegvideo_armv5te_s.S
libavcodec/arm/simple_idct_armv5te.S
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_ps.c
libavcodec/h264dsp.h
libavcodec/h264idct_template.c
libavcodec/mpegvideo.c
libavcodec/ppc/h264_altivec.c
libavcodec/snow.c
libavcodec/svq3.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_i386.h
libavcodec/x86/h264_idct.asm
libswscale/swscale.c