summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-03-04 10:30:27 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-03-04 10:30:27 +0000
commit1ea159173c1121cc04ded477383edc6a4a07f462 (patch)
tree2e3c6fa58b568a439ea69adaa7970b2bb7669246 /src/demuxers
parent2c22d49ec05086005a721ba1afad0d5a81413734 (diff)
downloadxine-lib-1ea159173c1121cc04ded477383edc6a4a07f462.tar.gz
xine-lib-1ea159173c1121cc04ded477383edc6a4a07f462.tar.bz2
fix compiler warnings at least in xine's native code
CVS patchset: 4330 CVS date: 2003/03/04 10:30:27
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_real.c8
-rw-r--r--src/demuxers/demux_str.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 9b6f4ce85..5bd666456 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -28,7 +28,7 @@
*
* Based on FFmpeg's libav/rm.c.
*
- * $Id: demux_real.c,v 1.44 2003/02/28 15:47:52 mroi Exp $
+ * $Id: demux_real.c,v 1.45 2003/03/04 10:30:28 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -723,8 +723,6 @@ static int stream_read_word (demux_real_t *this) {
static int demux_real_send_chunk(demux_plugin_t *this_gen) {
demux_real_t *this = (demux_real_t *) this_gen;
- char preamble[PREAMBLE_SIZE];
- unsigned char data_chunk_header[DATA_CHUNK_HEADER_SIZE];
char header[DATA_PACKET_HEADER_SIZE];
int stream, size, keyframe;
uint32_t timestamp;
@@ -984,7 +982,9 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) {
/* check if it's time to reload */
if (!this->current_data_chunk_packet_count &&
- this->next_data_chunk_offset) {
+ this->next_data_chunk_offset) {
+ char preamble[PREAMBLE_SIZE];
+ unsigned char data_chunk_header[DATA_CHUNK_HEADER_SIZE];
/* seek to the next DATA chunk offset */
this->input->seek(this->input, this->next_data_chunk_offset, SEEK_SET);
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 76a96d3c7..251dee367 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -22,7 +22,7 @@
* This demuxer handles either raw STR files (which are just a concatenation
* of raw compact disc sectors) or STR files with RIFF headers.
*
- * $Id: demux_str.c,v 1.5 2003/02/14 04:32:28 tmmm Exp $
+ * $Id: demux_str.c,v 1.6 2003/03/04 10:30:28 mroi Exp $
*/
/* CD-XA format:
@@ -303,7 +303,7 @@ static int open_str_file(demux_str_t *this) {
* sectors with 0 as the type, despite having plenty of
* video/audio sectors
*/
- /*return 0;*/
+ /*return 0*/;
}
/* seek to the next sector and read in the header */