• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · bff2afb3
    Michael Niedermayer authored
    * qatar/master:
      x86: dsputil: Only compile motion_est code when encoders are enabled
      mem: fix typo in check for __ICC
      fate: mp3: drop redundant CMP setting
      rtp: Depacketization of JPEG (RFC 2435)
      Rename ff_put_string to avpriv_put_string
      mjpeg: Rename some symbols to avpriv_* instead of ff_*
      yadif: cosmetics
    
    Conflicts:
    	Changelog
    	libavcodec/mjpegenc.c
    	libavcodec/x86/Makefile
    	libavfilter/vf_yadif.c
    	libavformat/version.h
    	libavutil/mem.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bff2afb3
Name
Last commit
Last update
..
Makefile Loading commit data...
ac3dsp.asm Loading commit data...
ac3dsp_init.c Loading commit data...
cabac.h Loading commit data...
cavsdsp.c Loading commit data...
dct32.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...
dnxhdenc.c Loading commit data...
dsputil.asm Loading commit data...
dsputil_avg_template.c Loading commit data...
dsputil_mmx.c Loading commit data...
dsputil_mmx.h Loading commit data...
dsputil_qns_template.c Loading commit data...
dsputil_rnd_template.c Loading commit data...
dsputilenc.asm Loading commit data...
dsputilenc_mmx.c Loading commit data...
dwt.c Loading commit data...
dwt.h Loading commit data...
dwt_yasm.asm Loading commit data...
fdct.c Loading commit data...
fft.asm Loading commit data...
fft.h Loading commit data...
fft_init.c Loading commit data...
fmtconvert.asm Loading commit data...
fmtconvert_init.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.c Loading commit data...
h264_qpel_10bit.asm Loading commit data...
h264_weight.asm Loading commit data...
h264_weight_10bit.asm Loading commit data...
h264dsp_init.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.asm Loading commit data...
lpc.c Loading commit data...
mathops.h Loading commit data...
mlpdsp.c Loading commit data...
motion_est.c Loading commit data...
mpegaudiodec.c Loading commit data...
mpegvideo.c Loading commit data...
mpegvideoenc.c Loading commit data...
mpegvideoenc_template.c Loading commit data...
pngdsp.asm Loading commit data...
pngdsp_init.c Loading commit data...
proresdsp.asm Loading commit data...
proresdsp_init.c 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...
sbrdsp.asm Loading commit data...
sbrdsp_init.c Loading commit data...
simple_idct.c Loading commit data...
snowdsp.c Loading commit data...
v210-init.c Loading commit data...
v210.asm Loading commit data...
vc1dsp.asm Loading commit data...
vc1dsp_mmx.c Loading commit data...
vp3dsp.asm Loading commit data...
vp3dsp_init.c Loading commit data...
vp56_arith.h Loading commit data...
vp56dsp.asm Loading commit data...
vp56dsp_init.c Loading commit data...
vp8dsp.asm Loading commit data...
vp8dsp_init.c Loading commit data...
w64xmmtest.c Loading commit data...