summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-02 02:51:33 +0200
committerwm4 <wm4@nowhere>2012-08-02 02:51:33 +0200
commited3f0c3e4b91b672b3a16ef884cd5a4ec3f6a12c (patch)
tree1853c394df3935f5327f2b75e21bb31bb2f8071f /libmpcodecs/vf.c
parentd5315a678ea93110f8bde10fe83eca64202988d1 (diff)
downloadmpv-ed3f0c3e4b91b672b3a16ef884cd5a4ec3f6a12c.tar.bz2
mpv-ed3f0c3e4b91b672b3a16ef884cd5a4ec3f6a12c.tar.xz
vf: remove VFCAP_FLIPPED and VFCAP_CONSTANT
These were unused.
Diffstat (limited to 'libmpcodecs/vf.c')
-rw-r--r--libmpcodecs/vf.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 8617609151..1954224359 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -683,22 +683,11 @@ int vf_config_wrapper(struct vf_instance *vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt)
{
- int r;
- if ((vf->default_caps & VFCAP_CONSTANT) && vf->fmt.have_configured) {
- if ((vf->fmt.orig_width != width)
- || (vf->fmt.orig_height != height)
- || (vf->fmt.orig_fmt != outfmt)) {
- mp_tmsg(MSGT_VFILTER, MSGL_ERR, "\nNew video file has different "
- "resolution or colorspace than the previous one.\n");
- return 0;
- }
- return 1;
- }
vf->fmt.have_configured = 1;
vf->fmt.orig_height = height;
vf->fmt.orig_width = width;
vf->fmt.orig_fmt = outfmt;
- r = vf->config(vf, width, height, d_width, d_height, flags, outfmt);
+ int r = vf->config(vf, width, height, d_width, d_height, flags, outfmt);
if (!r)
vf->fmt.have_configured = 0;
return r;