Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 May 2012 21:53:39 +0000 (23:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 May 2012 21:53:39 +0000 (23:53 +0200)
commit938adb7abcfb38ab8287e97847010479a116f78c
tree36d0bee76f90de3f425df905f603f6875d969cbb
parentfaa2930f191099621e03c55cca32662467d3cc15
parent13a867a63e64c62a41b7aa31bc61ca91a5eb1cf6
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dwt.c
libavcodec/dwt.h
libavformat/avformat.h
libavformat/flvenc.c
libavformat/http.c
libavformat/matroskaenc.c
libavformat/md5enc.c
libavformat/swfenc.c
libavformat/utils.c
libavformat/version.h
libavformat/wav.c