video: move decoder context from sh_video into new struct

This is similar to the sh_audio commit.

This is mostly cosmetic in nature, except that it also adds automatical
freeing of the decoder driver's state struct (which was in
sh_video->context, now in dec_video->priv).

Also remove all the stheader.h fields that are not needed anymore.

1 files changed, 6 insertions, 5 deletions

diff --git a/video/decode/vd.h b/video/decode/vd.h
index 488f9fa061..dd2536ab2a 100644
--- a/video/decode/vd.h
+++ b/video/decode/vd.h
@@ -21,6 +21,7 @@
 
 #include "video/mp_image.h"
 #include "demux/stheader.h"
+#include "dec_video.h"
 
 struct demux_packet;
 struct mp_decoder_list;
@@ -30,10 +31,10 @@ typedef struct vd_functions
 {
     const char *name;
     void (*add_decoders)(struct mp_decoder_list *list);
-    int (*init)(sh_video_t *sh, const char *decoder);
-    void (*uninit)(sh_video_t *sh);
-    int (*control)(sh_video_t *sh, int cmd, void *arg);
-    struct mp_image *(*decode)(struct sh_video *sh, struct demux_packet *pkt,
+    int (*init)(struct dec_video *vd, const char *decoder);
+    void (*uninit)(struct dec_video *vd);
+    int (*control)(struct dec_video *vd, int cmd, void *arg);
+    struct mp_image *(*decode)(struct dec_video *vd, struct demux_packet *pkt,
                                int flags, double *reordered_pts);
 } vd_functions_t;
 
@@ -47,6 +48,6 @@ enum vd_ctrl {
     VDCTRL_REINIT_VO, // reinit filter/VO chain
 };
 
-int mpcodecs_reconfig_vo(sh_video_t *sh, const struct mp_image_params *params);
+int mpcodecs_reconfig_vo(struct dec_video *vd, const struct mp_image_params *params);
 
 #endif /* MPLAYER_VD_H */