• 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
Makefile 22.7 KB