diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-11-11 19:05:46 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-11-11 19:05:46 +0000 |
| commit | 50dc32257205e24965ff2ab219d77bbcd00a2e02 (patch) | |
| tree | 1f284cb028535f777128132a51591760f7062c04 | |
| parent | 4e264feffade0d266f5c624ea2972d6e31f9ba22 (diff) | |
| parent | 29f7af688b53a81ba1a96c31757b86fde699e679 (diff) | |
| download | xine-lib-50dc32257205e24965ff2ab219d77bbcd00a2e02.tar.gz xine-lib-50dc32257205e24965ff2ab219d77bbcd00a2e02.tar.bz2 | |
Merge.
| -rw-r--r-- | src/demuxers/demux_idcin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index b6daaa0b9..954a2fc1a 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -129,7 +129,7 @@ static int demux_idcin_send_chunk(demux_plugin_t *this_gen) { unsigned char disk_palette[PALETTE_SIZE * 3]; palette_entry_t palette[PALETTE_SIZE]; int i; - unsigned int remaining_sample_bytes; + int remaining_sample_bytes; int scale_bits; /* figure out what the next data is */ @@ -356,7 +356,8 @@ static int open_idcin_file(demux_idcin_t *this) { static void demux_idcin_send_headers(demux_plugin_t *this_gen) { demux_idcin_t *this = (demux_idcin_t *) this_gen; buf_element_t *buf; - uint32_t i, size; + uint32_t i; + int size; this->video_fifo = this->stream->video_fifo; this->audio_fifo = this->stream->audio_fifo; |