diff options
| author | wm4 <wm4@nowhere> | 2014-05-01 18:47:07 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-05-02 01:08:05 +0200 |
| commit | 9243249a0e1fed9bb22213b651f285f796eb4759 (patch) | |
| tree | 370931741f2d213271c08bb11a5b44a7ec3f77d4 | |
| parent | 2a9b1d19ba3c7d9c2bd38d4eab423b9890f5f741 (diff) | |
| download | mpv-9243249a0e1fed9bb22213b651f285f796eb4759.tar.bz2 mpv-9243249a0e1fed9bb22213b651f285f796eb4759.tar.xz | |
vf: expose input parameters; clear parameters on failure
Preparation (and simplification) for following commits.
| -rw-r--r-- | video/filter/vf.c | 4 | ||||
| -rw-r--r-- | video/filter/vf.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c index e91b1a7ff1..fb3dee6e91 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -563,8 +563,8 @@ int vf_reconfig(struct vf_chain *c, const struct mp_image_params *params) break; cur = vf->fmt_out; } - if (r >= 0) - c->output_params = cur; + c->input_params = r < 0 ? (struct mp_image_params){0} : *params; + c->output_params = r < 0 ? (struct mp_image_params){0} : cur; c->initialized = r < 0 ? -1 : 1; int loglevel = r < 0 ? MSGL_WARN : MSGL_V; if (r == -2) diff --git a/video/filter/vf.h b/video/filter/vf.h index 8e73c69256..9ae9740380 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -102,6 +102,7 @@ struct vf_chain { struct vf_instance *first, *last; + struct mp_image_params input_params; struct mp_image_params output_params; uint8_t allowed_output_formats[IMGFMT_END - IMGFMT_START]; |