diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 17:39:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 19:16:12 +0200 |
| commit | b11b7ceb8926703d1fac8adc3595a20ab7afb471 (patch) | |
| tree | 03b7e0b35c9f16fa103b0902734739f7fb9c4009 /libavutil | |
| parent | 60ae776d04b69af23ea517cbf140bfd4bae7ddcb (diff) | |
| parent | dd9555e94b1481a6992ee89b285232e5abcf9089 (diff) | |
| download | ffmpeg-b11b7ceb8926703d1fac8adc3595a20ab7afb471.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: remove obsolete workaround in trim insertion.
lavu/log: do not skip overwritten lines.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 29ad2d0c28..cde7c12e4d 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -224,7 +224,8 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) is_atty = isatty(2) ? 1 : -1; #endif - if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && *line){ + if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && + *line && line[strlen(line) - 1] != '\r'){ count++; if (is_atty == 1) fprintf(stderr, " Last message repeated %d times\r", count); |