Michael Niedermayer 394b692b70 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>

2012-05-28 00:50:23 +02:00

74 KiB

Raw Blame History

View Raw