[SCM] libav/experimental: * fixing a regression introduced by the last seek-support patch

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:41:34 UTC 2013


The following commit has been merged in the experimental branch:
commit 457c649ac41db4765491e98efb877bfd1dd3d118
Author: Roman Shaposhnik <roman at shaposhnik.org>
Date:   Wed Sep 22 04:51:01 2004 +0000

        * fixing a regression introduced by the last seek-support patch
    
    Originally committed as revision 3490 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 2867ec0..9606bae 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -830,8 +830,8 @@ int64_t dv_frame_offset(DVDemuxContext *c, int64_t timestamp)
     sys = dv_codec_profile(&c->vst->codec);
 
     // timestamp was scaled by time_base/AV_BASE_RATE by av_seek_frame()
-    frame_number = av_rescale(sys->frame_rate, timestamp, 
-				      (int64_t) 30000 * sys->frame_rate_base);
+    frame_number = (timestamp * sys->frame_rate) / 
+                   ((int64_t) 30000 * sys->frame_rate_base);
 
     // offset must be a multiple of frame_size else dv_read_packet() will fail
     offset = (int64_t) sys->frame_size * frame_number;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list