[vlc-commits] d3d9: Remove useless ControlResetDevice intermediate function

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue May  2 18:53:30 2017 +0200| [7b6a5cf25c5509664e4e08223a4895406e010fcd] | committer: Hugo Beauzée-Luyssen

d3d9: Remove useless ControlResetDevice intermediate function

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b6a5cf25c5509664e4e08223a4895406e010fcd
---

 modules/video_output/win32/direct3d9.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 64b132800b..d766ebf563 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -543,10 +543,7 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
 
     CommonDisplay(vd);
 }
-static int ControlResetDevice(vout_display_t *vd)
-{
-    return Direct3D9Reset(vd);
-}
+
 static int ControlReopenDevice(vout_display_t *vd)
 {
     vout_display_sys_t *sys = vd->sys;
@@ -627,7 +624,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
     case VOUT_DISPLAY_RESET_PICTURES:
         /* FIXME what to do here in case of failure */
         if (sys->reset_device) {
-            if (ControlResetDevice(vd)) {
+            if (Direct3D9Reset(vd)) {
                 msg_Err(vd, "Failed to reset device");
                 return VLC_EGENERIC;
             }