gegl r2041 - in trunk: . operations/io

[kcozens svn gnome org]

Author: kcozens
Date: Mon Feb 18 16:55:18 2008
New Revision: 2041
URL: http://svn.gnome.org/viewvc/gegl?rev=2041&view=rev

Log:
* operations/io/ff-load.c: Wrong argument was passed to init() in
decode_frame(). Call init() in prepare() instead of using attach hook.


Modified:
   trunk/ChangeLog
   trunk/operations/io/ff-load.c

Modified: trunk/operations/io/ff-load.c
==============================================================================
--- trunk/operations/io/ff-load.c	(original)
+++ trunk/operations/io/ff-load.c	Mon Feb 18 16:55:18 2008
@@ -183,7 +183,7 @@
       /* seeking backwards, since it ffmpeg doesn't allow us,. we'll reload the file */
       g_free (p->loadedfilename);
       p->loadedfilename = NULL;
-      init (operation);
+      init (o);
     }
 
   while (decodeframe <= frame)
@@ -240,6 +240,9 @@
 
   gegl_operation_set_format (operation, "output", babl_format ("R'G'B'A u8"));
 
+  if (p == NULL)
+    init (o);
+
   if (!p->loadedfilename ||
       strcmp (p->loadedfilename, o->path))
     {
@@ -427,7 +430,6 @@
   source_class->process = process;
   operation_class->get_bounding_box = get_bounding_box;
   operation_class->prepare = prepare;
-  operation_class->attach = init;
 
   operation_class->name        = "ff-load";
   operation_class->categories  = "input:video";