• 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
Name
Last commit
Last update
..
Makefile Loading commit data...
ac3dsp.asm Loading commit data...
ac3dsp_mmx.c Loading commit data...
cabac.h Loading commit data...
cavsdsp_mmx.c Loading commit data...
dct32_sse.asm Loading commit data...
deinterlace.asm Loading commit data...
diracdsp_mmx.c Loading commit data...
diracdsp_mmx.h Loading commit data...
diracdsp_yasm.asm Loading commit data...
dnxhd_mmx.c Loading commit data...
dsputil_mmx.c Loading commit data...
dsputil_mmx.h Loading commit data...
dsputil_mmx_avg_template.c Loading commit data...
dsputil_mmx_qns_template.c Loading commit data...
dsputil_mmx_rnd_template.c Loading commit data...
dsputil_yasm.asm Loading commit data...
dsputilenc_mmx.c Loading commit data...
dsputilenc_yasm.asm Loading commit data...
dwt.c Loading commit data...
dwt.h Loading commit data...
dwt_yasm.asm Loading commit data...
fdct_mmx.c Loading commit data...
fft.c Loading commit data...
fft.h Loading commit data...
fft_3dn.c Loading commit data...
fft_3dn2.c Loading commit data...
fft_mmx.asm Loading commit data...
fft_sse.c Loading commit data...
fmtconvert.asm Loading commit data...
fmtconvert_mmx.c Loading commit data...
h264_chromamc.asm Loading commit data...
h264_chromamc_10bit.asm Loading commit data...
h264_deblock.asm Loading commit data...
h264_deblock_10bit.asm Loading commit data...
h264_i386.h Loading commit data...
h264_idct.asm Loading commit data...
h264_idct_10bit.asm Loading commit data...
h264_intrapred.asm Loading commit data...
h264_intrapred_10bit.asm Loading commit data...
h264_intrapred_init.c Loading commit data...
h264_qpel_10bit.asm Loading commit data...
h264_qpel_mmx.c Loading commit data...
h264_weight.asm Loading commit data...
h264_weight_10bit.asm Loading commit data...
h264dsp_mmx.c Loading commit data...
idct_mmx.c Loading commit data...
idct_mmx_xvid.c Loading commit data...
idct_sse2_xvid.c Loading commit data...
idct_xvid.h Loading commit data...
imdct36_sse.asm Loading commit data...
lpc_mmx.c Loading commit data...
mathops.h Loading commit data...
mlpdsp.c Loading commit data...
motion_est_mmx.c Loading commit data...
mpegaudiodec_mmx.c Loading commit data...
mpegvideo_mmx.c Loading commit data...
mpegvideo_mmx_template.c Loading commit data...
pngdsp-init.c Loading commit data...
pngdsp.asm Loading commit data...
proresdsp-init.c Loading commit data...
proresdsp.asm Loading commit data...
rv34dsp.asm Loading commit data...
rv34dsp_init.c Loading commit data...
rv40dsp.asm Loading commit data...
rv40dsp_init.c Loading commit data...
simple_idct_mmx.c Loading commit data...
snowdsp_mmx.c Loading commit data...
v210-init.c Loading commit data...
v210.asm Loading commit data...
vc1dsp_mmx.c Loading commit data...
vc1dsp_yasm.asm Loading commit data...
vp3dsp.asm Loading commit data...
vp56_arith.h Loading commit data...
vp56dsp.asm Loading commit data...
vp56dsp_init.c Loading commit data...
vp8dsp-init.c Loading commit data...
vp8dsp.asm Loading commit data...
w64xmmtest.c Loading commit data...