TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

all right, almost all parts of ffmpeg should be hooked in

Browse Source
This commit is contained in:
Zachary Pavlov 2006-05-14 22:35:54 +00:00
parent 366f48314e
commit cb65e0c44e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/grutil/config_grutil.cxx
View File

@ -19,6 +19,7 @@
#include "config_grutil.h" #include "config_grutil.h"
#include "frameRateMeter.h" #include "frameRateMeter.h"
#include "openCVTexture.h" #include "openCVTexture.h"
#include "ffmpegTexture.h"
#include "pandaSystem.h" #include "pandaSystem.h"
#include "texturePool.h" #include "texturePool.h"
@ -64,7 +65,6 @@ init_libgrutil() {
initialized = true; initialized = true;
FrameRateMeter::init_type(); FrameRateMeter::init_type();
#ifdef HAVE_OPENCV #ifdef HAVE_OPENCV
{ {
@ -80,6 +80,9 @@ init_libgrutil() {
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
{ {
//configure all known codecs. Can take a few frames.
av_register_all();
FFMpegTexture::init_type(); FFMpegTexture::init_type();
FFMpegTexture::register_with_read_factory(); FFMpegTexture::register_with_read_factory();

1
panda/src/grutil/grutil_composite1.cxx
View File

@ -4,4 +4,5 @@
#include "fisheyeMaker.cxx" #include "fisheyeMaker.cxx"
#include "frameRateMeter.cxx" #include "frameRateMeter.cxx"
#include "openCVTexture.cxx" #include "openCVTexture.cxx"
#include "ffmpegTexture.cxx"