Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 May 2012 22:15:14 +0000 (00:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 May 2012 22:50:23 +0000 (00:50 +0200)
commit394b692b70587af74a6957640cab0dce3bc9934d
tree4ed3f05e87700f045c91d4c9c33e31d5aae23442
parent875851294f7dc3ce5945c6d43b76c5dd1e0ec03d
parent8271f55bd7d6f4e06786dc8dd7c9538d83ad026a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avprobe: restore pseudo-INI old style format for compatibility.
  avprobe: fix formatting.
  log: make colored output more colorful.
  rtsp: Check for dynamic payload handlers if no static payload mapping was found

Conflicts:
Changelog
doc/ffprobe.texi
ffprobe.c
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtsp.c
libavutil/log.c