Changeset a76c04610bb31cd895cbd43bc1f93e871772c043

Timestamp:

06/30/08 00:01:52 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1214776912 +0000

git-parent:

[fae2f3f288543e0024d9a64bf940f9bc45778ae7]

git-author:

Laurent Aimar <fenrir@videolan.org> 1214776912 +0000

Message:

Cosmetics (moved down filter2 update)

Files:

• src/video_output/video_output.c (modified) (2 diffs)

src/video_output/video_output.c

@@ -914 +914 @@
-        }
-
-        /* Video Filter2 stuff */
-        if( p_vout->psz_vf2 )
-        {
-            es_format_t fmt;
-
-            vlc_mutex_lock( &p_vout->vfilter_lock );
-
-            es_format_Init( &fmt, VIDEO_ES, p_vout->fmt_render.i_chroma );
-            fmt.video = p_vout->fmt_render;
-            filter_chain_Reset( p_vout->p_vf2_chain, &fmt, &fmt );
-
-            if( filter_chain_AppendFromString( p_vout->p_vf2_chain,
-                                               p_vout->psz_vf2 ) < 0 )
-                msg_Err( p_vout, "Video filter chain creation failed" );
-
-            free( p_vout->psz_vf2 );
-            p_vout->psz_vf2 = NULL;
-            vlc_mutex_unlock( &p_vout->vfilter_lock );
-        }
-
-        if( p_picture )
-        {
@@ -1118 +1098 @@
-            vlc_mutex_unlock( &p_vout->picture_lock );
-        }
+
+        /* Check for "video filter2" changes */
+        vlc_mutex_lock( &p_vout->vfilter_lock );
+        if( p_vout->psz_vf2 )
+        {
+            es_format_t fmt;
+
+            es_format_Init( &fmt, VIDEO_ES, p_vout->fmt_render.i_chroma );
+            fmt.video = p_vout->fmt_render;
+            filter_chain_Reset( p_vout->p_vf2_chain, &fmt, &fmt );
+
+            if( filter_chain_AppendFromString( p_vout->p_vf2_chain,
+                                               p_vout->psz_vf2 ) < 0 )
+                msg_Err( p_vout, "Video filter chain creation failed" );
+
+            free( p_vout->psz_vf2 );
+            p_vout->psz_vf2 = NULL;
+        }
+        vlc_mutex_unlock( &p_vout->vfilter_lock );
-    }
-