[vlc-commits] vout: remove a tautology and simplify

Rémi Denis-Courmont git at videolan.org
Thu Oct 16 19:26:00 CEST 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 11 19:54:20 2014 +0300| [8e57077570da00821ea6092901e4b9f5e30701e7] | committer: Rémi Denis-Courmont

vout: remove a tautology and simplify

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

 src/video_output/video_output.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index cde99a8..bf7cbd0 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -154,12 +154,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
     vout->p->title.position = var_InheritInteger(vout, "video-title-position");
 
     /* Get splitter name if present */
-    char *splitter_name = var_InheritString(vout, "video-splitter");
-    if (splitter_name && *splitter_name) {
-        vout->p->splitter_name = splitter_name;
-    } else {
-        free(splitter_name);
-    }
+    vout->p->splitter_name = var_InheritString(vout, "video-splitter");
 
     /* */
     vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced);



More information about the vlc-commits mailing list