• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · bae053fc
    Michael Niedermayer authored
    * qatar/master:
      fate: make compare() function compatible with POSIX bc
      Update Janne's email address.
      APIchanges: Replace Subversion revision numbers by Git hashes.
      bytestream: Eliminate one level of pointless macro indirection.
      xwd: convert to bytestream2.
      vqavideo: port to bytestream2 API
      Read preset files with suffix .avpreset
      prores: allow user to set fixed quantiser
      lavf: remove some disabled code.
      lavf: only set average frame rate for video.
      lavf: remove a pointless check.
      avcodec: add XBM encoder
    
    Conflicts:
    	Changelog
    	cmdutils.c
    	cmdutils.h
    	doc/APIchanges
    	libavcodec/Makefile
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavcodec/vqavideo.c
    	libavformat/img2enc.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bae053fc
img2.c 2.97 KB