Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/demuxers demux_avi.c,1.216,1.217 demux_film.c,1.77,1.78 demux_flv.c,1.4,1.5 demux_matroska.c,1.32,1.33 ebml.c,1.2,1.3
|
From: Frantisek D. <va...@us...> - 2005-02-03 07:19:16
|
Update of /cvsroot/xine/xine-lib/src/demuxers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28355/src/demuxers Modified Files: demux_avi.c demux_film.c demux_flv.c demux_matroska.c ebml.c Log Message: **BUGFIX** Fixed build on solaris: - use libresolv in hstrerror check - replace PRIiMAX and PRIXMAX by PRIdMAX and PRIxMAX Removed timezone struct for MinGW from public os_types.h, update header comment. Fixed build musepack library on some platforms using xine types. Thanks to Niki W. Waibel for reporting and testing. Index: demux_avi.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_avi.c,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- demux_avi.c 9 Jan 2005 20:52:19 -0000 1.216 +++ demux_avi.c 3 Feb 2005 07:19:05 -0000 1.217 @@ -639,7 +639,7 @@ } } if (!valid_chunk) { - xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIiMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)chunk_pos); + xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIdMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)chunk_pos); } chunk_pos = this->input->seek(this->input, this->idx_grow.nexttagoffset, SEEK_SET); if (chunk_pos != this->idx_grow.nexttagoffset) { @@ -783,7 +783,7 @@ this->idx_grow.nexttagoffset = this->input->get_current_pos(this->input); if (this->input->read(this->input, data,8) != 8 ) { - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %" PRIiMAX "\n", (intmax_t)this->idx_grow.nexttagoffset); + xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %" PRIdMAX "\n", (intmax_t)this->idx_grow.nexttagoffset); break; /* We assume it's EOF */ } @@ -847,7 +847,7 @@ } } if (next_chunk != this->input->seek(this->input, next_chunk, SEEK_SET)) { - xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: failed to seek to the next chunk (pos %" PRIiMAX ")\n"), (intmax_t)next_chunk); + xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: failed to seek to the next chunk (pos %" PRIdMAX ")\n"), (intmax_t)next_chunk); break; /* probably slow seek */ } } @@ -1692,7 +1692,7 @@ return AVI_HEADER_AUDIO; } } - xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIiMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)this->input->get_current_pos(this->input)); + xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIdMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)this->input->get_current_pos(this->input)); return AVI_HEADER_UNKNOWN; } /* unreachable code */ @@ -2084,7 +2084,7 @@ */ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "start pos is %" PRIiMAX ", start time is %d\n", (intmax_t)start_pos, + "start pos is %" PRIdMAX ", start time is %d\n", (intmax_t)start_pos, start_time); /* Seek video. We do a single idx_grow at the beginning rather than Index: demux_film.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_film.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- demux_film.c 17 Sep 2004 19:21:34 -0000 1.77 +++ demux_film.c 3 Feb 2005 07:19:05 -0000 1.78 @@ -311,7 +311,7 @@ if (film->sample_table[j].pts > largest_pts) largest_pts = film->sample_table[j].pts; - llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIXMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n", + llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIxMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n", j, (intmax_t)film->sample_table[j].sample_offset, film->sample_table[j].sample_size, Index: demux_flv.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_flv.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_flv.c 17 Sep 2004 19:21:34 -0000 1.4 +++ demux_flv.c 3 Feb 2005 07:19:05 -0000 1.5 @@ -99,7 +99,7 @@ first_offset = BE_32(buffer); this->input->seek(this->input, first_offset, SEEK_SET); - lprintf(" qualified FLV file, repositioned @ offset 0x%" PRIXMAX "\n", + lprintf(" qualified FLV file, repositioned @ offset 0x%" PRIxMAX "\n", (intmax_t)first_offset); return 1; Index: demux_matroska.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_matroska.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- demux_matroska.c 13 Dec 2004 16:07:43 -0000 1.32 +++ demux_matroska.c 3 Feb 2005 07:19:05 -0000 1.33 @@ -1453,7 +1453,7 @@ if (size > 8) { off_t pos = this->input->get_current_pos(this->input); xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "demux_matroska: Invalid Track Number at position %" PRIiMAX "\n", + "demux_matroska: Invalid Track Number at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } @@ -1507,7 +1507,7 @@ if (this->input->read(this->input, this->block_data, len) != len) { off_t pos = this->input->get_current_pos(this->input); xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "demux_matroska: read error at position %" PRIiMAX "\n", + "demux_matroska: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } @@ -1877,7 +1877,7 @@ this->ebml->level = 1; if (this->input->seek(this->input, seek_pos, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)seek_pos); return 0; } @@ -1888,13 +1888,13 @@ memcpy(this->ebml, &ebml_bak, sizeof(ebml_parser_t)); /* FIXME */ if (this->input->seek(this->input, current_pos, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)current_pos); return 0; } } else { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: out of stream seek pos: %" PRIiMAX "\n", + "demux_matroska: out of stream seek pos: %" PRIdMAX "\n", (intmax_t)seek_pos); } return 1; @@ -2182,7 +2182,7 @@ next_level = 1; if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)this->segment.start); this->status = DEMUX_FINISHED; return; @@ -2202,7 +2202,7 @@ next_level = 1; if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + "demux_matroska: failed to seek to pos: %" PRIdMAX "\n", (intmax_t)this->segment.start); this->status = DEMUX_FINISHED; } Index: ebml.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/ebml.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebml.c 17 Sep 2004 19:21:45 -0000 1.2 +++ ebml.c 3 Feb 2005 07:19:06 -0000 1.3 @@ -107,7 +107,7 @@ if (size > 4) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: invalid EBML ID size (0x%x) at position %" PRIiMAX "\n", + "ebml: invalid EBML ID size (0x%x) at position %" PRIdMAX "\n", data[0], (intmax_t)pos); return 0; } @@ -116,7 +116,7 @@ if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } for(i = 1; i < size; i++) { @@ -139,7 +139,7 @@ if (ebml->input->read(ebml->input, data, 1) != 1) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } value = data[0]; @@ -152,7 +152,7 @@ if (size > 8) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: Invalid EBML length size (0x%x) at position %" PRIiMAX "\n", + "ebml: Invalid EBML length size (0x%x) at position %" PRIdMAX "\n", data[0], (intmax_t)pos); return 0; } @@ -170,7 +170,7 @@ if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } for (i = 1; i < size; i++) { @@ -193,7 +193,7 @@ if (ebml->input->read(ebml->input, buf, len) != len) { off_t pos = ebml->input->get_current_pos(ebml->input); xprintf(ebml->xine, XINE_VERBOSITY_LOG, - "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos); + "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos); return 0; } |