summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mf.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/demux_mf.c')
-rw-r--r--libmpdemux/demux_mf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index c7ac81d56f..9320c544ff 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -41,7 +41,7 @@ static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_del
else newpos+=rel_seek_secs * sh_video->fps;
if ( newpos < 0 ) newpos=0;
if( newpos >= mf->nr_of_files) newpos=mf->nr_of_files - 1;
- mf->curr_frame=newpos;
+ demuxer->filepos=mf->curr_frame=newpos;
}
// return value:
@@ -71,7 +71,7 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){
}
fclose( f );
- mf->curr_frame++;
+ demuxer->filepos=mf->curr_frame++;
return 1;
}
@@ -82,6 +82,7 @@ static const struct {
uint32_t format;
} type2format[] = {
{ "bmp", mmioFOURCC('b', 'm', 'p', ' ') },
+ { "dpx", mmioFOURCC('d', 'p', 'x', ' ') },
{ "jpeg", mmioFOURCC('I', 'J', 'P', 'G') },
{ "jpg", mmioFOURCC('I', 'J', 'P', 'G') },
{ "jls", mmioFOURCC('I', 'J', 'P', 'G') },
@@ -125,7 +126,7 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){
mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] file type was not set! trying 'type=%s'...\n", mf_type);
}
- mf->curr_frame=0;
+ demuxer->filepos=mf->curr_frame=0;
demuxer->movi_start = 0;
demuxer->movi_end = mf->nr_of_files - 1;