Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9960)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9965)
@@ -241,6 +241,6 @@
     if (m_swscale_ctx==0)
     {
-        m_swscale_ctx = sws_getContext(src_width, src_height, src_pix_fmt,
-                                      src_width, src_height, dst_pix_fmt,                                    
+        m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,
+                                      src_width, src_height, (PixelFormat) dst_pix_fmt,
                                       /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL);
     }
Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (revision 9885)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (revision 9965)
@@ -37,5 +37,6 @@
         supportsExtension("mpg", "Mpeg movie format");
         supportsExtension("mpv", "Mpeg movie format");
-        supportsExtension("wmv", "");
+        supportsExtension("wmv", "Windows Media Video format");
+        supportsExtension("mkv", "Matroska");
 
         // Register all FFmpeg formats/codecs