summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-11-23 17:25:46 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-11-23 17:25:46 +0000
commit2e5c6e2f4efaff9bda1b724ef294da795c528b29 (patch)
tree0a340df659a410d63468ded1468b51ce7913c7e5 /libvo
parent5b239d47bdb2b6a796b9a5718a4eeeea19ee2709 (diff)
downloadmpv-2e5c6e2f4efaff9bda1b724ef294da795c528b29.tar.bz2
mpv-2e5c6e2f4efaff9bda1b724ef294da795c528b29.tar.xz
Remove pointless is_cfG_finished variable.
Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28000 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_direct3d.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index 43f594777c..c52de7adcf 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -52,9 +52,6 @@ const LIBVO_EXTERN(direct3d)
static struct global_priv {
int is_paused; /**< 1 = Movie is paused,
0 = Movie is not paused */
- int is_cfg_finished; /**< Synchronization "semaphore". 1 when
- instance of reconfigure_d3d is finished */
-
RECT fs_movie_rect; /**< Rect (upscaled) of the movie when displayed
in fullscreen */
RECT fs_panscan_rect; /**< PanScan source surface cropping in
@@ -269,9 +266,6 @@ static void uninit_d3d(void)
{
mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>uninit_d3d called\r\n");
- /* Block further calls to reconfigure_d3d(). */
- priv->is_cfg_finished = 0;
-
/* Destroy D3D Context inside the window. */
destroy_d3d_context();
@@ -441,9 +435,6 @@ static int preinit(const char *arg)
return -1;
}
- /* Allow the first call to reconfigure_d3d. */
- priv->is_cfg_finished = 1;
-
return 0;
}
@@ -527,14 +518,9 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
return VO_ERROR;
}
- if (priv->is_cfg_finished) {
- priv->is_cfg_finished = 0;
- if (!reconfigure_d3d()) {
- priv->is_cfg_finished = 1;
- return VO_ERROR;
- }
- priv->is_cfg_finished = 1;
- }
+ if (!reconfigure_d3d())
+ return VO_ERROR;
+
return 0; /* Success */
}