diff options
| author | wm4 <wm4@nowhere> | 2015-01-03 03:37:05 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:18 +0900 |
| commit | dbc00297cc36e8470ff9996111077a72ab8a4a5f (patch) | |
| tree | 0ea7eacc31563afced92a73a434677e830f0d58a /video | |
| parent | 1e14d65db88017b41f661f105a23b71457341e80 (diff) | |
| download | mpv-dbc00297cc36e8470ff9996111077a72ab8a4a5f.tar.bz2 mpv-dbc00297cc36e8470ff9996111077a72ab8a4a5f.tar.xz | |
vf_vapoursynth: pass through container FPS value
This is basically a hack; but apparently a needed one, since many
vapoursynth filters insist on having a FPS set.
We need to apply the FPS override before creating the filters. Also
change some terminal output related to the FPS value.
Diffstat (limited to 'video')
| -rw-r--r-- | video/filter/vf.h | 2 | ||||
| -rw-r--r-- | video/filter/vf_vapoursynth.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index 4ff8398229..37ad4ca29c 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -123,6 +123,8 @@ struct vf_chain { struct mp_image_params output_params; uint8_t allowed_output_formats[IMGFMT_END - IMGFMT_START]; + double container_fps; + struct mp_log *log; struct MPOpts *opts; struct mpv_global *global; diff --git a/video/filter/vf_vapoursynth.c b/video/filter/vf_vapoursynth.c index 30fd992071..4b06d28b76 100644 --- a/video/filter/vf_vapoursynth.c +++ b/video/filter/vf_vapoursynth.c @@ -590,6 +590,7 @@ static int reinit_vs(struct vf_instance *vf) p->vsapi->propSetInt(vars, "video_in_dw", p->fmt_in.d_w, 0); p->vsapi->propSetInt(vars, "video_in_dh", p->fmt_in.d_h, 0); + p->vsapi->propSetFloat(vars, "container_fps", vf->chain->container_fps, 0); if (p->drv->load(vf, vars) < 0) goto error; |