diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
| commit | 21272e4f1caa9d0b3fe81f68929e8bbba125a977 (patch) | |
| tree | 34e6b88093d79653a2bdd60a9a127a18cfda2f1d /src/demuxers | |
| parent | a657c3df2f453941b115de0ece3ad8d849d58a6b (diff) | |
| download | xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.gz xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.bz2 | |
Various compilation fixes and updates:
- xine compilable without iconv (scream if I something broke)
- update MSVC port, fixes in avi demux
- add iff.h into makefiles
- ffmpeg depends on zlib (build was OK only when freetype was installed)
- commit a patch for goom
CVS patchset: 6192
CVS date: 2004/02/29 17:26:45
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/Makefile.am | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_avi.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index f577aab72..380c70d0e 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -149,4 +149,4 @@ xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) xineplug_dmx_iff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ include_HEADERS = demux.h -noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h +noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index e3f057c38..1037692c0 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.194 2004/02/09 22:24:36 jstembridge Exp $ + * $Id: demux_avi.c,v 1.195 2004/02/29 17:26:48 valtri Exp $ * * demultiplexer for avi streams * @@ -1223,15 +1223,15 @@ static avi_t *AVI_init(demux_avi_t *this) { chunk_start = en = malloc (AVI->video_superindex->aIndex[j].dwSize+hdrl_len); if (this->input->seek(this->input, AVI->video_superindex->aIndex[j].qwOffset, SEEK_SET) == (off_t)-1) { - lprintf("(%s) cannot seek to 0x%llx\n", __FILE__, -(unsigned long long)AVI->video_superindex->aIndex[j].qwOffset); + lprintf("(%s) cannot seek to 0x%" PRIx64 "\n", __FILE__, + AVI->video_superindex->aIndex[j].qwOffset); free(chunk_start); continue; } if (this->input->read(this->input, en, AVI->video_superindex->aIndex[j].dwSize+hdrl_len) <= 0) { - lprintf("(%s) cannot read from offset 0x%llx %ld bytes; broken (incomplete) file?\n", - __FILE__, (unsigned long long)AVI->video_superindex->aIndex[j].qwOffset, + lprintf("(%s) cannot read from offset 0x%" PRIx64 " %ld bytes; broken (incomplete) file?\n", + __FILE__, AVI->video_superindex->aIndex[j].qwOffset, (unsigned long)AVI->video_superindex->aIndex[j].dwSize+hdrl_len); free(chunk_start); continue; @@ -1289,14 +1289,14 @@ static avi_t *AVI_init(demux_avi_t *this) { chunk_start = en = malloc (AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize+hdrl_len); if (this->input->seek(this->input, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (off_t)-1) { - lprintf("(%s) cannot seek to 0x%llx\n", __FILE__, (unsigned long long)AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset); + lprintf("(%s) cannot seek to 0x%" PRIx64 "\n", __FILE__, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset); free(chunk_start); continue; } if (this->input->read(this->input, en, AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize+hdrl_len) <= 0) { - lprintf("(%s) cannot read from offset 0x%llx; broken (incomplete) file?\n", - __FILE__,(unsigned long long) AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset); + lprintf("(%s) cannot read from offset 0x%" PRIx64 "; broken (incomplete) file?\n", + __FILE__, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset); free(chunk_start); continue; } |