Changeset 5962 in orxonox.OLD

Timestamp:

Dec 7, 2005, 2:59:58 PM (18 years ago)

Author:

hdavid

Message:

avi_play: testfunction

Location:

branches/avi_play/src/lib/graphics/importer

Files:

• media_container.cc (modified) (1 diff)
• media_container.h (modified) (2 diffs)

branches/avi_play/src/lib/graphics/importer/media_container.cc

@@ -34 +34 @@
 MediaContainer::MediaContainer(const char* filename)
 {
+  /* register all formats and codecs */
+  av_register_all();
+
+  if (fileName != NULL)
+    this->loadMedia(filename);
 
 }

branches/avi_play/src/lib/graphics/importer/media_container.h

@@ -8 +8 @@
 #define _MEDIA_CONTAINER
 
-/* FFmpeg */
-//#include "ffmpeg/avformat.h"
 
 #ifdef HAVE_AVFORMAT_H
@@ -16 +14 @@
   #include <ffmpeg/avformat.h>
 #endif
+
 
 #include "glincl.h"