From 17ab38bc664308ea6fe17249b9ddd434b6e05d8e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 15 Jul 2013 00:52:17 +0200
Subject: dec_video: add vd_control wrapper

Slightly cleaner.
---
 video/decode/dec_video.c | 18 +++++++++++-------
 video/decode/dec_video.h |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index d101237699..ac351db6b6 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -43,6 +43,14 @@
 #include "video/decode/dec_video.h"
 
 
+int vd_control(struct sh_video *sh_video, int cmd, void *arg)
+{
+    const struct vd_functions *vd = sh_video->vd_driver;
+    if (vd)
+        return vd->control(sh_video, cmd, arg);
+    return CONTROL_UNKNOWN;
+}
+
 int get_video_quality_max(sh_video_t *sh_video)
 {
     vf_instance_t *vf = sh_video->vfilter;
@@ -146,24 +154,20 @@ void set_video_colorspace(struct sh_video *sh)
 void resync_video_stream(sh_video_t *sh_video)
 {
     const struct vd_functions *vd = sh_video->vd_driver;
-    if (vd)
-        vd->control(sh_video, VDCTRL_RESYNC_STREAM, NULL);
+    vd_control(sh_video, VDCTRL_RESYNC_STREAM, NULL);
     sh_video->prev_codec_reordered_pts = MP_NOPTS_VALUE;
     sh_video->prev_sorted_pts = MP_NOPTS_VALUE;
 }
 
 void video_reinit_vo(struct sh_video *sh_video)
 {
-    sh_video->vd_driver->control(sh_video, VDCTRL_REINIT_VO, NULL);
+    vd_control(sh_video, VDCTRL_REINIT_VO, NULL);
 }
 
 int get_current_video_decoder_lag(sh_video_t *sh_video)
 {
-    const struct vd_functions *vd = sh_video->vd_driver;
-    if (!vd)
-        return -1;
     int ret = -1;
-    vd->control(sh_video, VDCTRL_QUERY_UNSEEN_FRAMES, &ret);
+    vd_control(sh_video, VDCTRL_QUERY_UNSEEN_FRAMES, &ret);
     return ret;
 }
 
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index 05e3c7f0a1..6bca7fb573 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -43,6 +43,7 @@ void set_video_colorspace(struct sh_video *sh);
 void resync_video_stream(sh_video_t *sh_video);
 void video_reinit_vo(struct sh_video *sh_video);
 int get_current_video_decoder_lag(sh_video_t *sh_video);
+int vd_control(struct sh_video *sh_video, int cmd, void *arg);
 
 extern int divx_quality;
 
-- 
cgit v1.2.3