summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2005-11-14 12:34:45 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2005-11-14 12:34:45 +0000
commit678b4e9cad47a6c176bb05de32aa0dd56742f15a (patch)
treebbf9721ae6fb2fde3326bfece1af08ba34d3a164 /src/demuxers
parentdd90d5f61610a7bd59fe3f778d07000cc9746516 (diff)
downloadxine-lib-678b4e9cad47a6c176bb05de32aa0dd56742f15a.tar.gz
xine-lib-678b4e9cad47a6c176bb05de32aa0dd56742f15a.tar.bz2
*BUGFIX*
Testsuite for M$ Windows: - init mutex in all video drivers ('none' for testsuite, fixes crashes), was OK for linux pthreads - use WaitForSingleObject for console file descriptirs in _x_io_select (fixes stdin:/) - workaround heavy debug messages in asf demuxer for some samples (fixes full disk :->) Fixed previous fix, s/gmtime/timgm/ :-) Aalib cross detection + udate docs CVS patchset: 7799 CVS date: 2005/11/14 12:34:45
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_asf.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 18f1a54bf..583e0daac 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.172 2005/07/18 01:28:21 dsalt Exp $
+ * $Id: demux_asf.c,v 1.173 2005/11/14 12:34:46 valtri Exp $
*
* demultiplexer for asf streams
*
@@ -169,7 +169,9 @@ typedef struct demux_asf_s {
int64_t first_packet_pos;
int mode;
-
+
+ /* for fewer error messages */
+ GUID last_unknown_guid;
} demux_asf_t ;
typedef struct {
@@ -258,7 +260,9 @@ static int get_guid_id (demux_asf_t *this, GUID *g) {
return i;
}
}
-
+
+ if (!memcmp(g, &this->last_unknown_guid, sizeof(GUID))) return GUID_ERROR;
+ memcpy(&this->last_unknown_guid, g, sizeof(GUID));
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
"demux_asf: unknown GUID: 0x%" PRIx32 ", 0x%" PRIx16 ", 0x%" PRIx16 ", "
"{ 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 " }\n",