summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2002-10-27 15:51:53 +0000
committerMike Melanson <mike@multimedia.cx>2002-10-27 15:51:53 +0000
commitfb94d51c62b13c2db1c8daa4cf500cd95c884a06 (patch)
tree66c5fc78401ac818190aa4ee6e206103ba259ea1 /src
parent6d71c5de7c010e19ab9970064f9997df746725f7 (diff)
downloadxine-lib-fb94d51c62b13c2db1c8daa4cf500cd95c884a06.tar.gz
xine-lib-fb94d51c62b13c2db1c8daa4cf500cd95c884a06.tar.bz2
eliminate obsolete VALID_ENDS strings
CVS patchset: 3041 CVS date: 2002/10/27 15:51:53
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_film.c4
-rw-r--r--src/demuxers/demux_fli.c4
-rw-r--r--src/demuxers/demux_idcin.c6
-rw-r--r--src/demuxers/demux_qt.c4
-rw-r--r--src/demuxers/demux_smjpeg.c4
5 files changed, 8 insertions, 14 deletions
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 02f5e9063..63d1f60fe 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.38 2002/10/26 22:00:51 guenter Exp $
+ * $Id: demux_film.c,v 1.39 2002/10/27 15:51:53 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -51,8 +51,6 @@
#define STAB_TAG FOURCC_TAG('S', 'T', 'A', 'B')
#define CVID_TAG FOURCC_TAG('c', 'v', 'i', 'd')
-#define VALID_ENDS "cpk,cak,film"
-
typedef struct {
off_t sample_offset;
unsigned int sample_size;
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 51ea2b0e5..8a38a7b90 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -22,7 +22,7 @@
* avoid while programming a FLI decoder, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_fli.c,v 1.20 2002/10/26 22:00:51 guenter Exp $
+ * $Id: demux_fli.c,v 1.21 2002/10/27 15:51:53 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -43,8 +43,6 @@
#include "demux.h"
#include "bswap.h"
-#define VALID_ENDS "fli,flc"
-
#define FLI_HEADER_SIZE 128
#define FLI_FILE_MAGIC_1 0xAF11
#define FLI_FILE_MAGIC_2 0xAF12
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 6d279a63c..257da4ae1 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -63,7 +63,7 @@
* - if any bytes exceed 63, do not shift the bytes at all before
* transmitting them to the video decoder
*
- * $Id: demux_idcin.c,v 1.20 2002/10/26 22:00:51 guenter Exp $
+ * $Id: demux_idcin.c,v 1.21 2002/10/27 15:51:53 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -84,7 +84,6 @@
#include "demux.h"
#include "bswap.h"
-#define VALID_ENDS "cin"
#define IDCIN_HEADER_SIZE 20
#define HUFFMAN_TABLE_SIZE 65536
#define IDCIN_FRAME_PTS_INC (90000 / 14)
@@ -494,6 +493,9 @@ static void demux_idcin_stop (demux_plugin_t *this_gen) {
}
static void demux_idcin_dispose (demux_plugin_t *this) {
+
+ demux_idcin_stop(this);
+
free(this);
}
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 9714a324d..b53ee36fc 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
* build_frame_table
* free_qt_info
*
- * $Id: demux_qt.c,v 1.103 2002/10/26 22:00:53 guenter Exp $
+ * $Id: demux_qt.c,v 1.104 2002/10/27 15:51:53 tmmm Exp $
*
*/
@@ -102,8 +102,6 @@ typedef unsigned int qt_atom;
#define ATOM_PREAMBLE_SIZE 8
#define PALETTE_COUNT 256
-#define VALID_ENDS "mov,mp4,qt"
-
/* these are things that can go wrong */
typedef enum {
QT_OK,
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 7387e922e..04e2bfeca 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.20 2002/10/26 23:23:15 tmmm Exp $
+ * $Id: demux_smjpeg.c,v 1.21 2002/10/27 15:51:53 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -54,8 +54,6 @@
#define vidD_TAG FOURCC_TAG('v', 'i', 'd', 'D')
#define APCM_TAG FOURCC_TAG('A', 'P', 'C', 'M')
-#define VALID_ENDS "mjpg"
-
#define SMJPEG_SIGNATURE_SIZE 8
/* 16 is the max size of a header chunk (the video header) */
#define SMJPEG_VIDEO_HEADER_SIZE 16