]> git.sesse.net Git - vlc/commitdiff
Six hundred kiloby... i mean, 32 bytes should be enough to store mux info.
authorPavlov Konstantin <thresh@videolan.org>
Tue, 30 Oct 2007 01:31:49 +0000 (01:31 +0000)
committerPavlov Konstantin <thresh@videolan.org>
Tue, 30 Oct 2007 01:31:49 +0000 (01:31 +0000)
Add mkv file extension as ffmpeg now can mux to Matroska.

modules/stream_out/standard.c

index 800f0d01c17f180790f9d0396cdd13bfb3e6f7f8..477537c605a3a07864328ac5a3e40d66c61dc70d 100644 (file)
@@ -181,7 +181,7 @@ static int Open( vlc_object_t *p_this )
     if( psz_url && strrchr( psz_url, '.' ) )
     {
         /* by extension */
-        static struct { const char ext[6]; const char mux[16]; } exttomux[] =
+        static struct { const char ext[6]; const char mux[32]; } exttomux[] =
         {
             { "avi", "avi" },
             { "ogg", "ogg" },
@@ -200,6 +200,7 @@ static int Open( vlc_object_t *p_this )
             { "mpeg1","mpeg1" },
             { "wav", "wav" },
             { "flv", "ffmpeg{mux=flv}" },
+            { "mkv", "ffmpeg{mux=matroska}"},
             { "",    "" }
         };
         const char *psz_ext = strrchr( psz_url, '.' ) + 1;