From e14039fdbd35894ce04262c365d36133482f0513 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 26 Jul 2010 14:09:12 +0000 Subject: [PATCH] Add matroska video container --- panda/src/grutil/config_grutil.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/grutil/config_grutil.cxx b/panda/src/grutil/config_grutil.cxx index 884628853f..9716e4c259 100644 --- a/panda/src/grutil/config_grutil.cxx +++ b/panda/src/grutil/config_grutil.cxx @@ -109,9 +109,9 @@ init_libgrutil() { #if defined(HAVE_FFMPEG) TexturePool *ts = TexturePool::get_global_ptr(); if (use_movietexture) { - ts->register_texture_type(MovieTexture::make_texture, "avi mov mpg mpeg mp4 wmv asf flv nut ogm"); + ts->register_texture_type(MovieTexture::make_texture, "avi mov mpg mpeg mp4 wmv asf flv nut ogm mkv"); } else { - ts->register_texture_type(FFMpegTexture::make_texture, "avi mov mpg mpeg mp4 wmv asf flv nut ogm"); + ts->register_texture_type(FFMpegTexture::make_texture, "avi mov mpg mpeg mp4 wmv asf flv nut ogm mkv"); } #endif }