[xine-cvs] HG: xine-lib-1.2: Fix goom.

[Torsten J. <t....@gm...>]

# HG changeset patch
# User Torsten Jager <t....@gm...>
# Date 1516383745 -3600
# Node ID 38d3f773bd91615e18f42b4de4f7f7824a6abac2
# Branch  default
# Parent  77a743daee62f5cf4ad8f01530cbd5c910c87e1f
Fix goom.
 - Fix double free.
 - Fix source view fold/brace level highlight.

diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017 the xine project
+ * Copyright (C) 2000-2018 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -355,9 +355,10 @@
 {
   post_plugin_goom_t *this   = (post_plugin_goom_t *)this_gen;
 
-  rgb2yuy2_free (this->rgb2yuy2);
+  if (_x_post_dispose(this_gen)) {
 
-  if (_x_post_dispose(this_gen)) {
+    rgb2yuy2_free (this->rgb2yuy2);
+
     this->class->ip = NULL;
 
     goom_close(this->goom);
@@ -576,8 +577,9 @@
               frame->proc_slice (frame, sptr);
             }
           }
+        }
 #if defined(ARCH_X86)
-        } else if ((this->csc_method == 1) &&
+        else if ((this->csc_method == 1) &&
             (xine_mm_accel() & MM_ACCEL_X86_MMX)) {
           int plane_ptr = 0;
 
@@ -597,8 +599,9 @@
           }
 
           yuv444_to_yuy2(&this->yuv, frame->base[0], frame->pitches[0]);
+        }
 #endif /* ARCH_X86 */
-        } else {
+        else {
 
           while (goom_frame < goom_frame_end) {
             uint8_t r1, g1, b1, r2, g2, b2;