diff options
| -rw-r--r-- | src/demuxers/demux_asf.c | 14 | ||||
| -rw-r--r-- | src/demuxers/demux_avi.c | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index d50efe611..da0daaadb 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.62 2002/10/20 02:20:13 guenter Exp $ + * $Id: demux_asf.c,v 1.63 2002/10/20 13:50:41 guenter Exp $ * * demultiplexer for asf streams * @@ -1410,7 +1410,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, int len; switch (stream->content_detection_method) { - case XINE_DEMUX_CONTENT_STRATEGY: + case METHOD_BY_CONTENT: /* * try to get a preview of the data @@ -1422,11 +1422,13 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, if (memcmp(buf, &asf_header, sizeof(GUID))) return NULL; +#ifdef LOG printf ("demux_asf: file starts with an asf header\n"); +#endif break; - case XINE_DEMUX_EXTENSION_STRATEGY: { + case METHOD_BY_EXTENSION: { char *extension; char *mrl; @@ -1446,8 +1448,14 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, && strcasecmp((extension + 1), ".wma") ) { return NULL; } +#ifdef LOG + printf ("demux_asf: extension accepted.\n"); +#endif } break; + default: + printf ("demux_asf: warning, unkown method %d\n", stream->content_detection_method); + return NULL; } this = xine_xmalloc (sizeof (demux_asf_t)); diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index d2950bead..e7f833b1a 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_avi.c,v 1.121 2002/10/19 23:39:18 guenter Exp $ + * $Id: demux_avi.c,v 1.122 2002/10/20 13:50:41 guenter Exp $ * * demultiplexer for avi streams * @@ -1588,7 +1588,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case XINE_DEMUX_CONTENT_STRATEGY: + case METHOD_BY_CONTENT: if (input->get_capabilities(input) & INPUT_CAP_BLOCK) { printf ("demux_avi: AVI_init failed (AVI_errno: %d)\n", @@ -1608,7 +1608,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str break; - case XINE_DEMUX_EXTENSION_STRATEGY: { + case METHOD_BY_EXTENSION: { char *ending, *mrl; mrl = input->get_mrl (input); |