Merge branch '1.0'

[vlc] / modules / access / dshow / filter.cpp

diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index 8262e66ba4da8a33542a4e977c157241a2bf5e3c..d061633d767726faa5a8593741bc0c76b97216c4 100644 (file)
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_vout.h>
+#include <vlc_fourcc.h>
 
 #ifndef _MSC_VER
     /* Work-around a bug in w32api-2.5 */
@@ -286,7 +286,7 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type )
 
             /* MPEG2 video elementary stream */
             else if( media_type.subtype == MEDIASUBTYPE_MPEG2_VIDEO )
-               i_fourcc = VLC_CODEC_MP2V;
+               i_fourcc = VLC_CODEC_MPGV;
 
             /* DivX video */
             else if( media_type.subtype == MEDIASUBTYPE_DIVX )