Merge commit 'origin/1.0-bugfix'

[vlc] / modules / codec / mash.cpp

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index f6dbc3a70a1941c2adf01a53ad09121de31ac964..c5dce5bfe35fb08226108e8085e09dddef81b735 100644 (file)
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_block.h>
 
 #include <p64/p64.h>
@@ -191,9 +190,9 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     {
         msg_Dbg( p_dec, "video size is perhaps %dx%d", i_width,
                   i_height);
-        vout_InitFormat( &p_dec->fmt_out.video, VLC_CODEC_I420,
-                         i_width, i_height,
-                         VOUT_ASPECT_FACTOR * i_width / i_height );
+        video_format_Setup( &p_dec->fmt_out.video, VLC_CODEC_I420,
+                            i_width, i_height,
+                            VOUT_ASPECT_FACTOR * i_width / i_height );
         p_sys->b_inited = true;
     }
     p_pic = NULL;