• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · fa3fde16
    Michael Niedermayer authored
    * qatar/master:
      libvpxenc: use the default bitrate if not set
      utvideo: Rename utvideo.c to utvideodec.c
      doc: Fix syntax errors in sample Emacs config
      mjpegdec: more meaningful return values
      configure: clean up Altivec detection
      getopt: Remove an unnecessary define
      rtmp: Use int instead of ssize_t
      getopt: Add missing includes
      rtmp: Add support for receiving incoming streams
      Add missing includes for code relying on external libraries
    
    Conflicts:
    	libavcodec/libopenjpegenc.c
    	libavcodec/libvpxenc.c
    	libavcodec/mjpegdec.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    fa3fde16
libopenjpegenc.c 17.7 KB