[SCM] libav/experimental: Use cluster_pos when checking cluster position

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:06:33 UTC 2013


The following commit has been merged in the experimental branch:
commit cce800b456be8deda5a4fc1744e4acc87253a68b
Author: David Conrad <lessen42 at gmail.com>
Date:   Wed Sep 5 00:24:53 2007 +0000

    Use cluster_pos when checking cluster position
    
    Originally committed as revision 10357 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 6146ee1..3f4a3b6 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -677,7 +677,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
     int keyframe = !!(pkt->flags & PKT_FLAG_KEY);
 
     // start a new cluster every 5 MB or 5 sec
-    if (url_ftell(pb) > mkv->cluster + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
+    if (url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
         av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %llu bytes, pts %llu\n", url_ftell(pb), pkt->pts);
         end_ebml_master(pb, mkv->cluster);
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list