diff options
| author | Michael Niedermayer <[email protected]> | 2012-05-28 00:15:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-05-28 00:50:23 +0200 |
| commit | 394b692b70587af74a6957640cab0dce3bc9934d (patch) | |
| tree | 4ed3f05e87700f045c91d4c9c33e31d5aae23442 /libswscale/utils.c | |
| parent | 875851294f7dc3ce5945c6d43b76c5dd1e0ec03d (diff) | |
| parent | 8271f55bd7d6f4e06786dc8dd7c9538d83ad026a (diff) | |
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 <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions