diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-04-20 01:41:02 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-05-08 13:02:29 -0300 |
| commit | 924424d86781a5cfa4b59910f5f305e5ac348b4e (patch) | |
| tree | 1f117b326e01cb4f04e8f601a50ed32b9ad2bc0d | |
| parent | 30d07c74dbd9384e50535cfedde5237114a81bee (diff) | |
| download | ffmpeg-924424d86781a5cfa4b59910f5f305e5ac348b4e.tar.gz | |
avformat/matroskaenc: Improve log message
Since 4e3bdf729a80f868b014ceb02901d87198b545a5 there is no reason any
more to treat the seekable and non-seekable cases separate with regards
to the log message for a new cluster. This effectively reverts
d41aeea8a64bab5d7aacd602f7214f95baad109f.
Also improved the log message: "pts 80dts 0" -> "pts 80, dts 0".
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskaenc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index e62346963e..b300b23938 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2265,15 +2265,10 @@ static void mkv_start_new_cluster(AVFormatContext *s, AVPacket *pkt) end_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, mkv->cluster); mkv->cluster_pos = -1; - if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64 " bytes, " - "pts %" PRIu64 "dts %" PRIu64 "\n", + "pts %" PRIu64 ", dts %" PRIu64 "\n", avio_tell(s->pb), pkt->pts, pkt->dts); - else - av_log(s, AV_LOG_DEBUG, "Starting new cluster, " - "pts %" PRIu64 "dts %" PRIu64 "\n", - pkt->pts, pkt->dts); avio_flush(s->pb); } @@ -2551,12 +2546,9 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) if (mkv->cluster_pos != -1) { end_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, mkv->cluster); mkv->cluster_pos = -1; - if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) av_log(s, AV_LOG_DEBUG, "Flushing cluster at offset %" PRIu64 " bytes\n", avio_tell(s->pb)); - else - av_log(s, AV_LOG_DEBUG, "Flushing cluster\n"); avio_flush(s->pb); } return 1; |