From cb65e0c44e4a99bf79d0efb9d483a11b119241d1 Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Sun, 14 May 2006 22:35:54 +0000 Subject: [PATCH] all right, almost all parts of ffmpeg should be hooked in --- panda/src/grutil/config_grutil.cxx | 5 ++++- panda/src/grutil/grutil_composite1.cxx | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/grutil/config_grutil.cxx b/panda/src/grutil/config_grutil.cxx index 774c9d8e5f..c8536d5bf6 100644 --- a/panda/src/grutil/config_grutil.cxx +++ b/panda/src/grutil/config_grutil.cxx @@ -19,6 +19,7 @@ #include "config_grutil.h" #include "frameRateMeter.h" #include "openCVTexture.h" +#include "ffmpegTexture.h" #include "pandaSystem.h" #include "texturePool.h" @@ -64,7 +65,6 @@ init_libgrutil() { initialized = true; FrameRateMeter::init_type(); - #ifdef HAVE_OPENCV { @@ -80,6 +80,9 @@ init_libgrutil() { #ifdef HAVE_FFMPEG { + //configure all known codecs. Can take a few frames. + av_register_all(); + FFMpegTexture::init_type(); FFMpegTexture::register_with_read_factory(); diff --git a/panda/src/grutil/grutil_composite1.cxx b/panda/src/grutil/grutil_composite1.cxx index 69a8aef32a..2f47eb24da 100644 --- a/panda/src/grutil/grutil_composite1.cxx +++ b/panda/src/grutil/grutil_composite1.cxx @@ -4,4 +4,5 @@ #include "fisheyeMaker.cxx" #include "frameRateMeter.cxx" #include "openCVTexture.cxx" +#include "ffmpegTexture.cxx"