• Michael Niedermayer's avatar
    Merge commit 'fa8fcab1' · add7513e
    Michael Niedermayer authored
    * commit 'fa8fcab1':
      x86: h264_chromamc_10bit: drop pointless PAVG %define
      x86: mmx2 ---> mmxext in function names
      swscale: do not forget to swap data in formats with different endianness
    
    Conflicts:
    	libavcodec/x86/dsputil_mmx.c
    	libavfilter/x86/gradfun.c
    	libswscale/input.c
    	libswscale/utils.c
    	libswscale/x86/swscale.c
    	tests/ref/lavfi/pixfmts_scale
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    add7513e
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_amix.c Loading commit data...
af_anull.c Loading commit data...
af_aresample.c Loading commit data...
af_asetnsamples.c Loading commit data...
af_ashowinfo.c Loading commit data...
af_astreamsync.c Loading commit data...
af_asyncts.c Loading commit data...
af_atempo.c Loading commit data...
af_channelmap.c Loading commit data...
af_channelsplit.c Loading commit data...
af_earwax.c Loading commit data...
af_join.c Loading commit data...
af_pan.c Loading commit data...
af_resample.c Loading commit data...
af_silencedetect.c Loading commit data...
af_volume.c Loading commit data...
af_volumedetect.c Loading commit data...
all_channel_layouts.inc Loading commit data...
allfilters.c Loading commit data...
asink_anullsink.c Loading commit data...
asrc_abuffer.h Loading commit data...
asrc_aevalsrc.c Loading commit data...
asrc_anullsrc.c Loading commit data...
asrc_flite.c Loading commit data...
audio.c Loading commit data...
audio.h Loading commit data...
avcodec.c Loading commit data...
avcodec.h Loading commit data...
avf_concat.c Loading commit data...
avf_showspectrum.c Loading commit data...
avf_showwaves.c Loading commit data...
avfilter.c Loading commit data...
avfilter.h Loading commit data...
avfiltergraph.c Loading commit data...
avfiltergraph.h Loading commit data...
bbox.c Loading commit data...
bbox.h Loading commit data...
buffer.c Loading commit data...
bufferqueue.h Loading commit data...
buffersink.c Loading commit data...
buffersink.h Loading commit data...
buffersrc.c Loading commit data...
buffersrc.h Loading commit data...
drawutils.c Loading commit data...
drawutils.h Loading commit data...
f_ebur128.c Loading commit data...
f_sendcmd.c Loading commit data...
f_setpts.c Loading commit data...
f_settb.c Loading commit data...
fifo.c Loading commit data...
filtfmts.c Loading commit data...
formats.c Loading commit data...
formats.h Loading commit data...
gradfun.h Loading commit data...
graphdump.c Loading commit data...
graphparser.c Loading commit data...
internal.h Loading commit data...
lavfutils.c Loading commit data...
lavfutils.h Loading commit data...
libavfilter.v Loading commit data...
lswsutils.c Loading commit data...
lswsutils.h Loading commit data...
sink_buffer.c Loading commit data...
split.c Loading commit data...
src_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_alphaextract.c Loading commit data...
vf_alphamerge.c Loading commit data...
vf_aspect.c Loading commit data...
vf_ass.c Loading commit data...
vf_bbox.c Loading commit data...
vf_blackdetect.c Loading commit data...
vf_blackframe.c Loading commit data...
vf_boxblur.c Loading commit data...
vf_colormatrix.c Loading commit data...
vf_copy.c Loading commit data...
vf_crop.c Loading commit data...
vf_cropdetect.c Loading commit data...
vf_decimate.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_edgedetect.c Loading commit data...
vf_fade.c Loading commit data...
vf_field.c Loading commit data...
vf_fieldorder.c Loading commit data...
vf_format.c Loading commit data...
vf_fps.c Loading commit data...
vf_framestep.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_hue.c Loading commit data...
vf_idet.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_removelogo.c Loading commit data...
vf_scale.c Loading commit data...
vf_select.c Loading commit data...
vf_setfield.c Loading commit data...
vf_showinfo.c Loading commit data...
vf_slicify.c Loading commit data...
vf_smartblur.c Loading commit data...
vf_super2xsai.c Loading commit data...
vf_swapuv.c Loading commit data...
vf_thumbnail.c Loading commit data...
vf_tile.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...
video.c Loading commit data...
video.h Loading commit data...
vsink_nullsink.c Loading commit data...
vsrc_cellauto.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...