diff options
| author | Mike Melanson <mike@multimedia.cx> | 2002-06-02 19:18:56 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2002-06-02 19:18:56 +0000 |
| commit | 89d43b52cdb044fff8aaace32ad94dd48914c00c (patch) | |
| tree | c905b132a973ba563189c0457c8452dcae5ada15 /src/demuxers | |
| parent | 9e3b379ab92bae9b02c62dac776a9daebf65a205 (diff) | |
| download | xine-lib-89d43b52cdb044fff8aaace32ad94dd48914c00c.tar.gz xine-lib-89d43b52cdb044fff8aaace32ad94dd48914c00c.tar.bz2 | |
zlib is a pre-req for compilation, so do not bother checking for it
CVS patchset: 1986
CVS date: 2002/06/02 19:18:56
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_qt.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index c545e31e4..b460eb375 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,13 +30,10 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.34 2002/06/02 17:01:27 tmmm Exp $ + * $Id: demux_qt.c,v 1.35 2002/06/02 19:18:56 tmmm Exp $ * */ -#define HAVE_LIBZ - - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -48,6 +45,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> +#include <zlib.h> #include "xine_internal.h" #include "xineutils.h" @@ -55,12 +53,6 @@ #include "buffer.h" #include "bswap.h" -#ifdef HAVE_LIBZ -#include <zlib.h> -#else -#warning: No zlib support compiled into QT demuxer (no support for compressed headers) -#endif - typedef unsigned int qt_atom; #define BE_16(x) (be2me_16(*(unsigned short *)(x))) @@ -880,11 +872,9 @@ static qt_error open_qt_file(qt_info *info, input_plugin_t *input) { int64_t preseek_pos; /* zlib stuff */ -#ifdef HAVE_LIBZ z_stream z_state; int z_ret_code; unsigned char *unzip_buffer; -#endif /* reset the file */ if (input->seek(input, 0, SEEK_SET) != 0) { @@ -961,10 +951,6 @@ static qt_error open_qt_file(qt_info *info, input_plugin_t *input) { info->compressed_header = 1; -#ifndef HAVE_LIBZ - info->last_error = QT_NO_ZLIB; - return info->last_error; -#else if (BE_32(&moov_atom[12]) == CMOV_ATOM) { z_state.next_in = &moov_atom[0x28]; z_state.avail_in = top_level_atom_size - 0x28; @@ -1012,7 +998,6 @@ static qt_error open_qt_file(qt_info *info, input_plugin_t *input) { free (moov_atom); moov_atom = unzip_buffer; top_level_atom_size = BE_32 (&moov_atom[0]); -#endif } } else { input->seek(input, top_level_atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR); @@ -1299,7 +1284,8 @@ static int demux_qt_start (demux_plugin_t *this_gen, /* print vital stats */ xine_log (this->xine, XINE_LOG_FORMAT, - _("demux_qt: Apple Quicktime file, running time: %d min, %d sec\n"), + _("demux_qt: Apple Quicktime file, %srunning time: %d min, %d sec\n"), + (this->qt->compressed_header) ? "compressed header, " : "", this->qt->duration / this->qt->time_scale / 60, this->qt->duration / this->qt->time_scale % 60); if (this->qt->video_codec) |