• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 938adb7a
    Michael Niedermayer authored
    * qatar/master:
      dwt: K&R prettyprinting cosmetics
      Remove libnut wrapper
      fate: change name of FATE samples location environment variable
      avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
      http: Factorize the code by adding http_read_header()
    
    Conflicts:
    	configure
    	doc/APIchanges
    	doc/fate.texi
    	libavcodec/dwt.c
    	libavcodec/dwt.h
    	libavformat/Makefile
    	libavformat/avformat.h
    	libavformat/libnut.c
    	libavformat/matroskaenc.c
    	libavformat/utils.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    938adb7a
wav.c 24 KB