• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e847f412
    Michael Niedermayer authored
    * qatar/master:
      libspeexenc: add supported sample rates and channel layouts.
      Replace usleep() calls with av_usleep()
      lavu: add av_usleep() function
      utvideo: mark interlaced frames as such
      utvideo: Fix interlaced prediction for RGB utvideo.
      cosmetics: do not use full path for local headers
      lavu/file: include unistd.h only when available
      configure: check for unistd.h
      log: include unistd.h only when needed
      lavf: include libavutil/time.h instead of redeclaring av_gettime()
    
    Conflicts:
    	configure
    	doc/APIchanges
    	ffmpeg.c
    	ffplay.c
    	libavcodec/utvideo.c
    	libavutil/avutil.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e847f412
log.c 7.98 KB