Changeset 39eef2d3c94153157cafa65f8b655c19e6b80806

Timestamp:

06/04/08 13:14:12 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212578052 +0200

git-parent:

[5cc4255aa74f938e38cbdd9dcca4136475a4bc3f]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212577070 +0200

Message:

Ugly hack to make the filter chain work correctly for the video output core. This will be removed once all the different picture release methods have been merged into one coherent method.

Files:

• src/misc/filter_chain.c (modified) (2 diffs)

src/misc/filter_chain.c

@@ -278 +278 @@
- * Apply the filter chain
- */
+
+/* FIXME This include is needed by the Ugly hack */
+#include <vlc_vout.h>
+
-picture_t *filter_chain_VideoFilter( filter_chain_t *p_chain, picture_t *p_pic )
-{
@@ -285 +289 @@
-    {
-        filter_t *p_filter = pp_filter[i];
-_
-
+icture_t *p_new
+new
-            return NULL;
+        /* FIXME Ugly hack to make it work in picture core.
+         * FIXME Remove this code when the picture release API has been
+         * FIXME cleaned up (a git revert of the commit should work) */
+        if( p_chain->p_this->i_object_type == VLC_OBJECT_VOUT )
+        {
+            if( p_pic->i_refcount )
+                p_pic->i_status = DISPLAYED_PICTURE;
+            else
+                p_pic->i_status = DESTROYED_PICTURE;
+            p_newpic->i_status = READY_PICTURE;
+        }
+        p_pic = p_newpic;
-    }
-    return p_pic;