• 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
..
libmpcodecs Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
af_aconvert.c Loading commit data...
af_aformat.c Loading commit data...
af_amerge.c Loading commit data...
af_anull.c Loading commit data...
af_aresample.c Loading commit data...
af_ashowinfo.c Loading commit data...
af_asplit.c Loading commit data...
af_astreamsync.c Loading commit data...
af_earwax.c Loading commit data...
af_pan.c Loading commit data...
af_silencedetect.c Loading commit data...
af_volume.c Loading commit data...
all_channel_layouts.h Loading commit data...
allfilters.c Loading commit data...
asink_anullsink.c Loading commit data...
asrc_abuffer.c Loading commit data...
asrc_abuffer.h Loading commit data...
asrc_aevalsrc.c Loading commit data...
asrc_anullsrc.c Loading commit data...
avcodec.c Loading commit data...
avcodec.h Loading commit data...
avfilter.c Loading commit data...
avfilter.h Loading commit data...
avfiltergraph.c Loading commit data...
avfiltergraph.h Loading commit data...
buffersink.h Loading commit data...
buffersrc.h Loading commit data...
defaults.c Loading commit data...
drawutils.c Loading commit data...
drawutils.h Loading commit data...
formats.c Loading commit data...
gradfun.h Loading commit data...
graphdump.c Loading commit data...
graphparser.c Loading commit data...
internal.h Loading commit data...
libavfilter.v Loading commit data...
sink_buffer.c Loading commit data...
src_movie.c Loading commit data...
transform.c Loading commit data...
transform.h Loading commit data...
version.h Loading commit data...
vf_aspect.c Loading commit data...
vf_ass.c Loading commit data...
vf_blackframe.c Loading commit data...
vf_boxblur.c Loading commit data...
vf_copy.c Loading commit data...
vf_crop.c Loading commit data...
vf_cropdetect.c Loading commit data...
vf_delogo.c Loading commit data...
vf_deshake.c Loading commit data...
vf_drawbox.c Loading commit data...
vf_drawtext.c Loading commit data...
vf_fade.c Loading commit data...
vf_fieldorder.c Loading commit data...
vf_fifo.c Loading commit data...
vf_format.c Loading commit data...
vf_frei0r.c Loading commit data...
vf_gradfun.c Loading commit data...
vf_hflip.c Loading commit data...
vf_hqdn3d.c Loading commit data...
vf_libopencv.c Loading commit data...
vf_lut.c Loading commit data...
vf_mp.c Loading commit data...
vf_null.c Loading commit data...
vf_overlay.c Loading commit data...
vf_pad.c Loading commit data...
vf_pixdesctest.c Loading commit data...
vf_scale.c Loading commit data...
vf_select.c Loading commit data...
vf_setfield.c Loading commit data...
vf_setpts.c Loading commit data...
vf_settb.c Loading commit data...
vf_showinfo.c Loading commit data...
vf_slicify.c Loading commit data...
vf_split.c Loading commit data...
vf_thumbnail.c Loading commit data...
vf_tinterlace.c Loading commit data...
vf_transpose.c Loading commit data...
vf_unsharp.c Loading commit data...
vf_vflip.c Loading commit data...
vf_yadif.c Loading commit data...
vsink_nullsink.c Loading commit data...
vsrc_buffer.c Loading commit data...
vsrc_buffer.h Loading commit data...
vsrc_cellauto.c Loading commit data...
vsrc_color.c Loading commit data...
vsrc_life.c Loading commit data...
vsrc_mandelbrot.c Loading commit data...
vsrc_mptestsrc.c Loading commit data...
vsrc_testsrc.c Loading commit data...
yadif.h Loading commit data...