Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jun 2011 01:53:58 +0000 (03:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jun 2011 01:53:58 +0000 (03:53 +0200)
commit7a02527b05e2ae5ffab579062dbe3c888758335f
treec52ec9666f9436a6c15df3c6b32d08d897771aba
parenta0bafaabb0656ca3bb3591beba0de79f6153fdac
parentb203f65451646b1555d458a3601159f7d89a3397
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: use correct alignment and length in channel coupling dsp functions.
  ffmpeg: don't abuse a global for passing framerate from input to output
  ffmpeg: don't abuse a global for passing channels from input to output
  ffmpeg: don't abuse a global for passing samplerate from input to output
  ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
  swscale: use SwsContext for av_log when available
  swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
  swscale: Fix compilation with --disable-mmx2.

Conflicts:
ffmpeg.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/h264idct_neon.S
libswscale/utils.c
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale_mmx.c
libswscale/x86/yuv2rgb_mmx.c