Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Feb 2012 23:44:20 +0000 (00:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Feb 2012 00:27:12 +0000 (01:27 +0100)
commitf2b20b7a8b6fcbcd8cc669f5211e4e2ed7d8e9f3
treeb21166497b8ac3b1e5f840d8b5d73bda7f77e3d5
parentd8710228eaafbcf60aa72861de81fc849759ea0b
parent38d553322891c8e47182f05199d19888422167dc
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pixdesc: mark pseudopaletted formats with a special flag.
  avconv: switch to avcodec_encode_video2().
  libx264: implement encode2().
  libx264: split extradata writing out of encode_nals().
  lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket
  cmdutils: update copyright year to 2012.
  swscale: sign-extend integer function argument to qword on x86-64.
  x86inc: support yasm -f win64 flag also.
  h264: manually save/restore XMM registers for functions using INIT_MMX.
  x86inc: allow manual use of WIN64_SPILL_XMM.
  aacdec: Use correct speaker order for 7.1.
  aacdec: Remove incorrect comment.
  aacdec: Simplify output configuration.
  Remove Sun medialib glue code.
  dsputil: set STRIDE_ALIGN to 16 for x86 also.
  pngdsp: swap argument inversion.

Conflicts:
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
libavcodec/aacdec.c
libavcodec/dsputil.h
libavcodec/libx264.c
libavcodec/mlib/dsputil_mlib.c
libavcodec/utils.c
libavfilter/vf_scale.c
libavutil/avutil.h
libswscale/mlib/yuv2rgb_mlib.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
32 files changed:
configure
doc/APIchanges
ffmpeg.c
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/aacdectab.h
libavcodec/avcodec.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imgconvert.c
libavcodec/libx264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/options.c
libavcodec/rawdec.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavfilter/vf_crop.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/x86/x86inc.asm
libswscale/Makefile
libswscale/swscale_internal.h
libswscale/x86/output.asm
libswscale/yuv2rgb.c