RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_mf: fix previous commit 

It was total crap.
This commit is contained in:
wm4 2015-12-23 21:58:01 +01:00
parent f9ba1a3ddf
commit 25497226cf
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demux/demux_mf.c
View File

@ -39,7 +39,7 @@
typedef struct mf {
struct mp_log *log;
struct sh_video *sh;
struct sh_stream *sh;
int curr_frame;
int nr_of_files;
char **names;
@ -165,7 +165,7 @@ static void demux_seek_mf(demuxer_t *demuxer, double rel_seek_secs, int flags)
if (flags & SEEK_FACTOR)
newpos += rel_seek_secs * (mf->nr_of_files - 1);
else
newpos += rel_seek_secs * mf->sh->fps;
newpos += rel_seek_secs * mf->sh->video->fps;
if (newpos < 0)
newpos = 0;
if (newpos >= mf->nr_of_files)
@ -199,7 +199,7 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer)
demux_packet_t *dp = new_demux_packet(data.len);
if (dp) {
memcpy(dp->buffer, data.start, data.len);
dp->pts = mf->curr_frame / mf->sh->fps;
dp->pts = mf->curr_frame / mf->sh->video->fps;
dp->keyframe = true;
demux_add_packet(mf->sh, dp);
}
@ -324,7 +324,9 @@ static int demux_open_mf(demuxer_t *demuxer, enum demux_check check)
sh_video->disp_h = 0;
sh_video->fps = demuxer->opts->mf_fps;
mf->sh = sh_video;
demux_add_sh_stream(demuxer, sh);
mf->sh = sh;
demuxer->priv = (void *)mf;
demuxer->seekable = true;
@ -344,7 +346,7 @@ static int demux_control_mf(demuxer_t *demuxer, int cmd, void *arg)
switch (cmd) {
case DEMUXER_CTRL_GET_TIME_LENGTH:
*((double *)arg) = (double)mf->nr_of_files / mf->sh->fps;
*((double *)arg) = (double)mf->nr_of_files / mf->sh->video->fps;
return DEMUXER_CTRL_OK;
default: