[vlc-commits] vout: avoid intermediate variable, simplify

Rémi Denis-Courmont git at videolan.org
Wed Jan 23 17:04:23 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jan 21 21:50:00 2019 +0200| [e86729a34d0b119b37b69d0002b50acf9494a265] | committer: Rémi Denis-Courmont

vout: avoid intermediate variable, simplify

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

 src/video_output/video_output.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index d4a81a704a..f95a6af2dc 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -112,26 +112,20 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
                                  const vout_configuration_t *cfg,
                                  input_thread_t *input)
 {
-    video_format_t original;
-
     if (!VoutCheckFormat(cfg->fmt))
         return NULL;
 
-    VoutFixFormat(&original, cfg->fmt);
-
     /* Allocate descriptor */
     vout_thread_t *vout = vlc_custom_create(object,
                                             sizeof(*vout) + sizeof(*vout->p),
                                             "video output");
-    if (!vout) {
-        video_format_Clean(&original);
+    if (!vout)
         return NULL;
-    }
 
     /* */
     vout->p = (vout_thread_sys_t*)&vout[1];
 
-    vout->p->original = original;
+    VoutFixFormat(&vout->p->original, cfg->fmt);
     vout->p->dpb_size = cfg->dpb_size;
     vout->p->mouse_event = cfg->mouse_event;
     vout->p->opaque = cfg->opaque;



More information about the vlc-commits mailing list