H264 support in mkv, patch by Steve Lhomme

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 6f0f9af2700aaf039fdf209e39c77794f233a3c3..3d9422dcfa1a8aac738c22ee2a3445a307205696 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -569,6 +569,10 @@ static int Open( vlc_object_t * p_this )
             {
                 tk.fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' );
             }
+            else if( !strcmp( tk.psz_codec, "V_MPEG4/ISO/AVC" ) )
+            {
+                tk.fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '4' );
+            }
             else
             {
                 tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );