• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f2b20b7a
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f2b20b7a
options.c 48.4 KB