Ticket #1276: demux_filepos3.diff

libmpdemux/demux_film.c

@@ -201 +201 @@
         film_chunk.chunk_offset, (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0);
     }
   }
+  demuxer->filepos = film_chunk.chunk_offset;
   film_data->current_chunk++;
 
   return 1;

libmpdemux/demux_gif.c

@@ -212 +212 @@
 
   demuxer->video->dpos++;
   dp->pts = ((float)priv->current_pts) / 100;
-  dp->pos = stream_tell(demuxer->stream);
+  dp->pos = demuxer->filepos = stream_tell(demuxer->stream);
   ds_add_packet(demuxer->video, dp);
 
   return 1;

libmpdemux/demux_mf.c

@@ -47 +47 @@
    demux_packet_t * dp = new_demux_packet( fs.st_size );
    if ( !fread( dp->buffer,fs.st_size,1,f ) ) return 0;
    dp->pts=mf->curr_frame / sh_video->fps;
-   dp->pos=mf->curr_frame;
+   dp->pos=demuxer->filepos=mf->curr_frame;
    dp->flags=0;
    // append packet to DS stream:
    ds_add_packet( demuxer->video,dp );

libmpdemux/demux_rawaudio.c

@@ -70 +70 @@
 
   dp = new_demux_packet(l);
   dp->pts = (spos - demuxer->movi_start)  / (float)(sh_audio->wf->nAvgBytesPerSec);
-  dp->pos = (spos - demuxer->movi_start);
+  dp->pos = demuxer->filepos = (spos - demuxer->movi_start);
 
   l = stream_read(demuxer->stream,dp->buffer,l);
   resize_demux_packet(dp, l);

libmpdemux/demux_roq.c

@@ -73 +73 @@
 
   // make sure we're at the right place in the stream and fetch the chunk
   stream_seek(demuxer->stream, roq_chunk.chunk_offset);
+  demuxer->filepos = roq_chunk.chunk_offset;
 
   if (roq_chunk.chunk_type == CHUNK_TYPE_AUDIO)
     ds_read_packet(demuxer->audio, demuxer->stream, roq_chunk.chunk_size,

libmpdemux/demux_vqf.c

@@ -172 +172 @@
 
   dp = new_demux_packet(l);
   ds->pts = spos / (float)(sh_audio->wf->nAvgBytesPerSec);
-  ds->pos = spos;
+  ds->pos = demuxer->filepos = spos;
 
   l=stream_read(demuxer->stream,dp->buffer,l);
   resize_demux_packet(dp,l);

libmpdemux/demux_xmms.c

@@ -329 +329 @@
     pthread_mutex_lock(&xmms_mutex);
     dp = new_demux_packet(XMMS_PACKETSIZE/2);
     dp->pts = priv->spos / sh_audio->wf->nAvgBytesPerSec;
-    ds->pos = priv->spos;
+    ds->pos = demuxer->filepos = priv->spos;
 
     memcpy(dp->buffer,xmms_audiobuffer,XMMS_PACKETSIZE/2);
     memcpy(xmms_audiobuffer,&xmms_audiobuffer[XMMS_PACKETSIZE/2],