diff --git a/panda/src/grutil/Sources.pp b/panda/src/grutil/Sources.pp
index a610f9ca9b..db3c6c845e 100644
--- a/panda/src/grutil/Sources.pp
+++ b/panda/src/grutil/Sources.pp
@@ -1,7 +1,7 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m prc:c
 
-#define USE_PACKAGES opencv
+#define USE_PACKAGES opencv ffmpeg
 
 #begin lib_target
   #define TARGET grutil
@@ -17,7 +17,7 @@
     frameRateMeter.I frameRateMeter.h \
     lineSegs.I lineSegs.h \
     multitexReducer.I multitexReducer.h multitexReducer.cxx \
-    openCVTexture.h openCVTexture.I 
+    openCVTexture.h openCVTexture.I ffmpegTexture.h ffmpegTexture.I 
     
   #define INCLUDED_SOURCES \
     cardMaker.cxx \
@@ -25,7 +25,8 @@
     config_grutil.cxx \
     frameRateMeter.cxx \
     openCVTexture.cxx \    	 
-    lineSegs.cxx 
+    lineSegs.cxx \
+    ffmpegTexture.cxx
     
 
   #define INSTALL_HEADERS \
@@ -34,7 +35,8 @@
     frameRateMeter.I frameRateMeter.h \
     lineSegs.I lineSegs.h \
     multitexReducer.I multitexReducer.h \
-    openCVTexture.I openCVTexture.h
+    openCVTexture.I openCVTexture.h\
+    ffmpegTexture.I ffmpegTexture.h
 
   #define IGATESCAN all
 
diff --git a/panda/src/grutil/config_grutil.cxx b/panda/src/grutil/config_grutil.cxx
index 7b50a14a23..774c9d8e5f 100644
--- a/panda/src/grutil/config_grutil.cxx
+++ b/panda/src/grutil/config_grutil.cxx
@@ -66,13 +66,28 @@ init_libgrutil() {
   FrameRateMeter::init_type();
 
 #ifdef HAVE_OPENCV
+  
+  {
   OpenCVTexture::init_type();
   OpenCVTexture::register_with_read_factory();
 
   PandaSystem *ps = PandaSystem::get_global_ptr();
   ps->add_system("OpenCV");
   TexturePool *ts = TexturePool::get_global_ptr();
-  ts->register_texture_type(OpenCVTexture::make_texture, "avi mpg");
+  ts->register_texture_type(OpenCVTexture::make_texture, "");
+	}
 #endif // HAVE_OPENCV
+
+#ifdef HAVE_FFMPEG
+  {
+  FFMpegTexture::init_type();
+  FFMpegTexture::register_with_read_factory();
+
+  PandaSystem *ps = PandaSystem::get_global_ptr();
+  ps->add_system("FFMpeg");
+  TexturePool *ts = TexturePool::get_global_ptr();
+  ts->register_texture_type(FFMpegTexture::make_texture, "avi mov");
+	}
+#endif // HAVE_FFMPEG
 }