[FFmpeg-cvslog] avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable

James Almer git at videolan.org
Thu Oct 6 23:32:30 EEST 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Oct  2 14:14:51 2016 -0300| [d41aeea8a64bab5d7aacd602f7214f95baad109f] | committer: James Almer

avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable

Printing the dynamic buffer offset is useless.

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d41aeea8a64bab5d7aacd602f7214f95baad109f
---

 libavformat/matroskaenc.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index c94c8a0..9611682 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1950,10 +1950,15 @@ static void mkv_start_new_cluster(AVFormatContext *s, AVPacket *pkt)
         pb = mkv->dyn_bc;
     }
 
-    av_log(s, AV_LOG_DEBUG,
-            "Starting new cluster at offset %" PRIu64 " bytes, "
-            "pts %" PRIu64 "dts %" PRIu64 "\n",
-            avio_tell(pb), pkt->pts, pkt->dts);
+    if (s->pb->seekable)
+        av_log(s, AV_LOG_DEBUG,
+               "Starting new cluster at offset %" PRIu64 " bytes, "
+               "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);
     end_ebml_master(pb, mkv->cluster);
     mkv->cluster_pos = -1;
     if (mkv->dyn_bc)
@@ -2136,9 +2141,12 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt)
         pb = mkv->dyn_bc;
     if (!pkt) {
         if (mkv->cluster_pos != -1) {
-            av_log(s, AV_LOG_DEBUG,
-                   "Flushing cluster at offset %" PRIu64 " bytes\n",
-                   avio_tell(pb));
+            if (s->pb->seekable)
+                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");
             end_ebml_master(pb, mkv->cluster);
             mkv->cluster_pos = -1;
             if (mkv->dyn_bc)



More information about the ffmpeg-cvslog mailing list