added the FILM and SMJPEG demuxers to the games group

CVS patchset: 3773
CVS date: 2003/01/04 16:40:48

4 files changed, 13 insertions, 32 deletions

diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 0d7d4046e..ef13ac6c2 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -35,7 +35,6 @@ lib_LTLIBRARIES = $(ogg_module) $(asf_module) $(mng_module) \
 	xineplug_dmx_mpeg_elem.la \
 	xineplug_dmx_qt.la \
 	xineplug_dmx_fli.la \
-	xineplug_dmx_smjpeg.la \
 	xineplug_dmx_yuv4mpeg2.la \
 	xineplug_dmx_real.la \
 	xineplug_dmx_rawdv.la \
@@ -81,10 +80,6 @@ xineplug_dmx_fli_la_SOURCES = demux_fli.c
 xineplug_dmx_fli_la_LIBADD = $(XINELIB)
 xineplug_dmx_fli_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
-xineplug_dmx_smjpeg_la_SOURCES = demux_smjpeg.c
-xineplug_dmx_smjpeg_la_LIBADD = $(XINELIB)
-xineplug_dmx_smjpeg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-
 xineplug_dmx_yuv4mpeg2_la_SOURCES = demux_yuv4mpeg2.c
 xineplug_dmx_yuv4mpeg2_la_LIBADD = $(XINELIB)
 xineplug_dmx_yuv4mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
@@ -107,7 +102,8 @@ xineplug_dmx_pva_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_dmx_games_la_SOURCES = group_games.c demux_eawve.c \
 				demux_idcin.c demux_ipmovie.c demux_roq.c \
-				demux_vqa.c demux_wc3movie.c demux_str.c
+				demux_vqa.c demux_wc3movie.c demux_str.c \
+				demux_film.c demux_smjpeg.c
 xineplug_dmx_games_la_LIBADD = $(XINELIB)
 xineplug_dmx_games_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index ebe730531..5aded9ed0 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
  * For more information on the FILM file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_film.c,v 1.49 2003/01/04 14:48:12 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.50 2003/01/04 16:40:49 tmmm Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -182,7 +182,7 @@ static int open_film_file(demux_film_t *film) {
       /* always fetch the video information */
       film->bih.biWidth = BE_32(&film_header[i + 16]);
       film->bih.biHeight = BE_32(&film_header[i + 12]);
-      film->video_codec = BE_32(&film_header[i + 8]);
+      film->video_codec = *(uint32_t *)&film_header[i + 8];
       film->video_type = fourcc_to_buf_video(*(uint32_t *)&film_header[i + 8]);
 
       /* fetch the audio information if the chunk size checks out */
@@ -515,6 +515,7 @@ static void demux_film_send_headers(demux_plugin_t *this_gen) {
     (this->audio_type) ? 1 : 0;
   this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH]  = this->bih.biWidth;
   this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->bih.biHeight;
+  this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = this->video_codec;
   this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
     this->audio_channels;
   this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
@@ -780,7 +781,7 @@ static void class_dispose (demux_class_t *this_gen) {
   free (this);
 }
 
-static void *init_plugin (xine_t *xine, void *data) {
+void *demux_film_init_plugin (xine_t *xine, void *data) {
 
   demux_film_class_t     *this;
 
@@ -797,13 +798,3 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 20, "film", XINE_VERSION_CODE, NULL, init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 7c76a7489..4717a5c67 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.31 2003/01/04 14:48:12 miguelfreitas Exp $
+ * $Id: demux_smjpeg.c,v 1.32 2003/01/04 16:40:48 tmmm Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -535,7 +535,7 @@ static void class_dispose (demux_class_t *this_gen) {
   free (this);
 }
 
-static void *init_plugin (xine_t *xine, void *data) {
+void *demux_smjpeg_init_plugin (xine_t *xine, void *data) {
 
   demux_smjpeg_class_t     *this;
 
@@ -552,13 +552,3 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 20, "smjpeg", XINE_VERSION_CODE, NULL, init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c
index 3aacb007c..56272e4da 100644
--- a/src/demuxers/group_games.c
+++ b/src/demuxers/group_games.c
@@ -19,7 +19,7 @@
  *
  * This file contains plugin entries for several demuxers used in games
  *
- * $Id: group_games.c,v 1.1 2003/01/04 14:48:12 miguelfreitas Exp $
+ * $Id: group_games.c,v 1.2 2003/01/04 16:40:49 tmmm Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +37,8 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data);
 void *demux_wc3movie_init_plugin (xine_t *xine, void *data);
 void *demux_roq_init_plugin (xine_t *xine, void *data);
 void *demux_str_init_plugin (xine_t *xine, void *data);
+void *demux_film_init_plugin (xine_t *xine, void *data);
+void *demux_smjpeg_init_plugin (xine_t *xine, void *data);
 
 /*
  * exported plugin catalog entries
@@ -51,5 +53,7 @@ plugin_info_t xine_plugin_info[] = {
   { PLUGIN_DEMUX, 20, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin },
   { PLUGIN_DEMUX, 20, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin },
   { PLUGIN_DEMUX, 20, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin },
+  { PLUGIN_DEMUX, 20, "film", XINE_VERSION_CODE, NULL, demux_film_init_plugin },
+  { PLUGIN_DEMUX, 20, "smjpeg", XINE_VERSION_CODE, NULL, demux_smjpeg_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };