[FFmpeg-cvslog] r25833 - trunk/libavformat/dv.c

[reimar]

Author: reimar
Date: Sat Nov 27 15:40:12 2010
New Revision: 25833

Log:
DV: use data_offset to fix seeking in badly cut files where the first
complete frame does not start at position 0.

Modified:
   trunk/libavformat/dv.c

Modified: trunk/libavformat/dv.c
==============================================================================
--- trunk/libavformat/dv.c	Sat Nov 27 02:07:06 2010	(r25832)
+++ trunk/libavformat/dv.c	Sat Nov 27 15:40:12 2010	(r25833)
@@ -370,7 +370,7 @@ static int64_t dv_frame_offset(AVFormatC
     // FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk)
     const DVprofile* sys = ff_dv_codec_profile(c->vst->codec);
     int64_t offset;
-    int64_t size = url_fsize(s->pb);
+    int64_t size = url_fsize(s->pb) - s->data_offset;
     int64_t max_offset = ((size-1) / sys->frame_size) * sys->frame_size;
 
     offset = sys->frame_size * timestamp;
@@ -378,7 +378,7 @@ static int64_t dv_frame_offset(AVFormatC
     if (size >= 0 && offset > max_offset) offset = max_offset;
     else if (offset < 0) offset = 0;
 
-    return offset;
+    return offset + s->data_offset;
 }
 
 void dv_offset_reset(DVDemuxContext *c, int64_t frame_offset)