Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 May 2011 04:32:23 +0000 (06:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 May 2011 04:32:45 +0000 (06:32 +0200)
commit034fc7bf129152b94958f4b74b9c81590350ce59
treedf83c0f966ce07a832588a54dca4e57ba97575be
parentd1adad3cca407f493c3637e20ecd4f7124e69212
parent9bbd6a4cd89da4bfc9fd36fea5777a539a542b40
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  configure: enable memalign_hack automatically when needed
  swscale: unbreak the build on non-x86 systems.
  swscale: remove if(bitexact) branch from functions.
  swscale: remove if(canMMX2BeUsed) conditional.
  swscale: remove swScale_{c,MMX,MMX2} duplication.
  swscale: use emms_c().
  Move emms_c() from libavcodec to libavutil.
  tiff: set palette in the context when specified in TIFF_PAL tag
  rtsp: use strtoul to parse rtptime and seq values.
  pgssubdec: fix incorrect colors.
  dvdsubdec: fix incorrect colors.
  ape: Allow demuxing of files with metadata tags.
  swscale: remove dead macro WRITEBGR24OLD.
  swscale: remove AMD3DNOW "optimizations".
  swscale: remove duplicate code in ppc/ subdirectory.
  swscale: remove duplicated x86/ functions.
  swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.
  vsrc_buffer.h: add file doxy
  vsrc_buffer: tweak error message in init()
  msmpeg4: reindent.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
40 files changed:
configure
doc/encoders.texi
libavcodec/Makefile
libavcodec/ac3.h
libavcodec/ac3dec.h
libavcodec/ac3dec_data.c
libavcodec/ac3dec_data.h
libavcodec/ac3enc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3tab.c
libavcodec/ac3tab.h
libavcodec/allcodecs.c
libavcodec/dsputil.h
libavcodec/mpegvideo_enc.c
libavcodec/msmpeg4.c
libavcodec/msmpeg4.h
libavcodec/tiff.c
libavfilter/vf_mp.c
libavfilter/vsrc_buffer.h
libavformat/ape.c
libavutil/internal.h
libswscale/bfin/swscale_bfin.c
libswscale/colorspace-test.c
libswscale/options.c
libswscale/ppc/swscale_template.c
libswscale/ppc/yuv2rgb_altivec.c
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c
libswscale/swscale.c
libswscale/swscale.h
libswscale/swscale_internal.h
libswscale/swscale_template.c
libswscale/utils.c
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb_mmx.c
libswscale/x86/yuv2rgb_template.c
libswscale/yuv2rgb.c