From ed3f0c3e4b91b672b3a16ef884cd5a4ec3f6a12c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 2 Aug 2012 02:51:33 +0200
Subject: vf: remove VFCAP_FLIPPED and VFCAP_CONSTANT

These were unused.
---
 libmpcodecs/vd.c    |  2 --
 libmpcodecs/vf.c    | 13 +------------
 libmpcodecs/vfcap.h |  4 ----
 3 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'libmpcodecs')

diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index e7a497009a..a9dbbf2fe6 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -243,8 +243,6 @@ int mpcodecs_config_vo2(sh_video_t *sh, int w, int h,
             if (!(sh->codec->outflags[j] & CODECS_FLAG_NOFLIP))
                 opts->flip = 1;
     }
-    if (sh->output_flags & VFCAP_FLIPPED)
-        opts->flip ^= 1;
     if (opts->flip && !(sh->output_flags & VFCAP_FLIP)) {
         // we need to flip, but no flipping filter avail.
         vf_add_before_vo(&vf, "flip", NULL);
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;
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h
index eca9b5ef7f..86c6f6e477 100644
--- a/libmpcodecs/vfcap.h
+++ b/libmpcodecs/vfcap.h
@@ -35,15 +35,11 @@
 
 // driver/hardware handles timing (blocking)
 #define VFCAP_TIMER 0x100
-// driver _always_ flip image upside-down (for ve_vfw)
-#define VFCAP_FLIPPED 0x200
 // vf filter: accepts stride (put_image)
 // vo driver: has draw_slice() support for the given csp
 #define VFCAP_ACCEPT_STRIDE 0x400
 // filter does postprocessing (so you shouldn't scale/filter image before it)
 #define VFCAP_POSTPROC 0x800
-// filter cannot be reconfigured to different size & format
-#define VFCAP_CONSTANT 0x1000
 // filter can draw EOSD
 #define VFCAP_EOSD 0x2000
 // filter will draw EOSD at screen resolution (without scaling)
-- 
cgit v1.2.3