cleanup: remove some things related to old video decoders

1 files changed, 7 insertions, 18 deletions

diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index 8b0f9c1aea..6b9803a611 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -33,35 +33,24 @@ typedef struct vd_functions
     const vd_info_t *info;
     int (*init)(sh_video_t *sh);
     void (*uninit)(sh_video_t *sh);
-    int (*control)(sh_video_t *sh, int cmd, void *arg, ...);
-    mp_image_t * (*decode)(sh_video_t * sh, void *data, int len, int flags);
-    struct mp_image *(*decode2)(struct sh_video *sh, struct demux_packet *pkt,
-                                void *data, int len, int flags,
-                                double *reordered_pts);
+    int (*control)(sh_video_t *sh, int cmd, void *arg);
+    struct mp_image *(*decode)(struct sh_video *sh, struct demux_packet *pkt,
+                               void *data, int len, int flags,
+                               double *reordered_pts);
 } vd_functions_t;
 
 // NULL terminated array of all drivers
 extern const vd_functions_t *const mpcodecs_vd_drivers[];
 
 #define VDCTRL_QUERY_FORMAT 3       // test for availabilty of a format
-#define VDCTRL_QUERY_MAX_PP_LEVEL 4 // query max postprocessing level (if any)
-#define VDCTRL_SET_PP_LEVEL 5       // set postprocessing level
-#define VDCTRL_SET_EQUALIZER 6 // set color options (brightness,contrast etc)
-#define VDCTRL_GET_EQUALIZER 7 // get color options (brightness,contrast etc)
 #define VDCTRL_RESYNC_STREAM 8 // reset decode state after seeking
 #define VDCTRL_QUERY_UNSEEN_FRAMES 9 // current decoder lag
 #define VDCTRL_RESET_ASPECT 10 // reinit filter/VO chain for new aspect ratio
 
 // callbacks:
-int mpcodecs_config_vo2(sh_video_t *sh, int w, int h,
-                        const unsigned int *outfmts,
-                        unsigned int preferred_outfmt);
-
-static inline int mpcodecs_config_vo(sh_video_t *sh, int w, int h,
-                                     unsigned int preferred_outfmt)
-{
-    return mpcodecs_config_vo2(sh, w, h, NULL, preferred_outfmt);
-}
+int mpcodecs_config_vo(sh_video_t *sh, int w, int h,
+                       const unsigned int *outfmts,
+                       unsigned int preferred_outfmt);
 
 mp_image_t *mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,
                                int w, int h);