# HG changeset patch
# User Diego 'Flameeyes' Pettenò <[EMAIL PROTECTED]>
# Date 1181319118 -7200
# Node ID 8406a037d09e1a3bc0eb54ee866a88bb04524ec1
# Parent c5895b357b5a3abc9b6f526cb8434a27da808e2c
Mark some stuff constant, reduce scope of a few other variables.
diff -r 8406a037d09e1a3bc0eb54ee866a88bb04524ec1 -r
c5895b357b5a3abc9b6f526cb8434a27da808e2c src/demuxers/demux_qt.c
--- a/src/demuxers/demux_qt.c Fri Jun 08 18:11:58 2007 +0200
+++ b/src/demuxers/demux_qt.c Fri Jun 08 18:08:35 2007 +0200
@@ -820,19 +820,7 @@ static qt_error parse_trak_atom (qt_trak
const unsigned int trak_atom_size = BE_32(&trak_atom[0]);
unsigned int atom_pos;
unsigned int properties_offset;
- unsigned int current_stsd_atom_size;
qt_error last_error = QT_OK;
-
- /* for palette traversal */
- int color_depth;
- int color_flag;
- int color_start;
- int color_count;
- int color_end;
- int color_index;
- int color_dec;
- int color_greyscale;
- const unsigned char *color_table;
/* initialize trak structure */
trak->edit_list_count = 0;
@@ -950,7 +938,18 @@ static qt_error parse_trak_atom (qt_trak
properties_offset = 0x0C;
for (k = 0; k < trak->stsd_atoms_count; k++) {
- current_stsd_atom_size = BE_32(&trak_atom[atom_pos - 4]);
+ const uint32_t current_stsd_atom_size = BE_32(&trak_atom[atom_pos -
4]);
+
+ /* for palette traversal */
+ int color_depth;
+ int color_flag;
+ int color_start;
+ int color_count;
+ int color_end;
+ int color_index;
+ int color_dec;
+ int color_greyscale;
+ const unsigned char *color_table;
if (trak->type == MEDIA_VIDEO) {
@@ -1231,7 +1230,7 @@ static qt_error parse_trak_atom (qt_trak
(BE_32(&trak_atom[atom_pos + 0x34]) == WAVE_ATOM) &&
(BE_32(&trak_atom[atom_pos + 0x3C]) == FRMA_ATOM) &&
(ME_32(&trak_atom[atom_pos + 0x48]) ==
trak->stsd_atoms[k].audio.codec_fourcc)) {
- int wave_size = BE_32(&trak_atom[atom_pos + 0x44]) - 8;
+ const int wave_size = BE_32(&trak_atom[atom_pos + 0x44]) - 8;
if ((wave_size >= sizeof(xine_waveformatex)) &&
(current_atom_size >= (0x4C + wave_size))) {
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
