diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 21:27:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 21:27:09 +0200 |
| commit | 277ae5a7b30496eabfb35b4dd6a62a335a422085 (patch) | |
| tree | 8b103f7a61bed8a88062ad9bac50943ca85a1090 /libavformat | |
| parent | 31f2357fd0e273365b1ae667e191638937e188e3 (diff) | |
| parent | 374fdc8c071dcd96422378b0a1a0d453336d8a01 (diff) | |
| download | ffmpeg-277ae5a7b30496eabfb35b4dd6a62a335a422085.tar.gz | |
Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01'
* commit '374fdc8c071dcd96422378b0a1a0d453336d8a01':
flv: Improve log messages
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 759979f2df..41f9380620 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -580,7 +580,7 @@ static int flv_read_header(AVFormatContext *s) flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO; av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, " - "this might fail\n"); + "this might fail.\n"); } s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -820,7 +820,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) } } else { av_log(s, AV_LOG_DEBUG, - "skipping flv packet: type %d, size %d, flags %d\n", + "Skipping flv packet: type %d, size %d, flags %d.\n", type, size, flags); skip: avio_seek(s->pb, next, SEEK_SET); @@ -937,7 +937,7 @@ retry_duration: if (cts < 0) { // dts are wrong flv->wrong_dts = 1; av_log(s, AV_LOG_WARNING, - "negative cts, previous timestamps might be wrong\n"); + "Negative cts, previous timestamps might be wrong.\n"); } else if (FFABS(dts - pts) > 1000*60*15) { av_log(s, AV_LOG_WARNING, "invalid timestamps %"PRId64" %"PRId64"\n", dts, pts); |