[cogl/wip/cogl-gst-1.x] cogl-gst: Smooth out issues with layering code

[Lionel Landwerlin <llandwerlin src gnome org>]

commit 2eb16b73085a9bf75173fef30af03e33f11f24aa
Author: Plamena Manolova <plamena n manolova intel com>
Date:   Wed Apr 10 11:00:25 2013 +0100

    cogl-gst: Smooth out issues with layering code
    
    This fixes a few bugs in the custom coversion and
    the frame attachment code.

 cogl-gst/cogl-gst-video-sink.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 3e27116..07601ed 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -634,14 +634,14 @@ cogl_gst_video_sink_attach_custom_conversion (CoglGstVideoSink *sink,
 
   snippet = NULL;
 
-  if (start > 0 && start != last_layer && modulate)
+  if (start > 0 && start != previous_layer && modulate)
     {
       src =
         g_strdup_printf ("cogl_layer = cogl_layer%i.rgba * %s (cogl_tex_coord%i_in.st);",
-                         last_layer, convertion_name, start);
+                         previous_layer, convertion_name, start);
       snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_LAYER_FRAGMENT, NULL, src);
     }
-  else if (modulate)
+  else if (modulate && start == 0)
     {
       src = g_strdup_printf ("cogl_layer =  %s (cogl_tex_coord%i_in.st);",
                              convertion_name);