• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4da42ebe
    Michael Niedermayer authored
    * qatar/master:
      MS Screen 1 decoder
      aacdec: Fix popping channel layouts.
      av_gettime: support Win32 without gettimeofday()
      Use av_gettime() in various places
      Move av_gettime() to libavutil
      dct-test: use emms_c() from libavutil instead of duplicating it
      mov: fix operator precedence bug
      mathematics.h: remove a couple of math defines
      Remove unnecessary inclusions of [sys/]time.h
      lavf: remove unnecessary inclusions of unistd.h
      bfin: libswscale: add const where appropriate to fix warnings
      bfin: libswscale: remove unnecessary #includes
      udp: Properly check for invalid sockets
      tcp: Check the return value from getsockopt
      network: Use av_strerror for getting error messages
      udp: Properly print error from getnameinfo
      mmst: Use AVUNERROR() to convert error codes to the right range for strerror
      network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows
      rtmp: Reduce the number of idle posts sent by sleeping 50ms
    
    Conflicts:
    	Changelog
    	configure
    	libavcodec/aacdec.c
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/dct-test.c
    	libavcodec/version.h
    	libavformat/riff.c
    	libavformat/udp.c
    	libavutil/Makefile
    	libswscale/bfin/yuv2rgb_bfin.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4da42ebe
oss_audio.c 8.28 KB