1
0
Fork 0
forked from len0rd/rockbox

Fix compiler warnings ('variable set ut not used') with GCC 4.6.0.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29792 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-04-27 17:59:49 +00:00
parent 4170ac8ac6
commit fa65362a42
2 changed files with 6 additions and 13 deletions

View file

@ -55,7 +55,6 @@ typedef struct
static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
{ {
fourcc_t type; fourcc_t type;
uint32_t minor_ver;
size_t size_remaining = chunk_len - 8; size_t size_remaining = chunk_len - 8;
type = stream_read_uint32(qtmovie->stream); type = stream_read_uint32(qtmovie->stream);
@ -71,7 +70,7 @@ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
DEBUGF("not M4A file\n"); DEBUGF("not M4A file\n");
return; return;
} }
minor_ver = stream_read_uint32(qtmovie->stream); /* minor_ver = */ stream_read_uint32(qtmovie->stream);
size_remaining-=4; size_remaining-=4;
/* compatible brands */ /* compatible brands */
@ -104,9 +103,6 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len)
{ {
uint8_t tag; uint8_t tag;
uint32_t temp; uint32_t temp;
int audioType;
int32_t maxBitrate;
int32_t avgBitrate;
(void)chunk_len; (void)chunk_len;
/* version and flags */ /* version and flags */
@ -138,12 +134,10 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len)
temp = mp4ff_read_mp4_descr_length(qtmovie->stream); temp = mp4ff_read_mp4_descr_length(qtmovie->stream);
if (temp < 13) return false; if (temp < 13) return false;
audioType = stream_read_uint8(qtmovie->stream); /* audioType = */ stream_read_uint8(qtmovie->stream);
temp=stream_read_int32(qtmovie->stream);//0x15000414 ???? /* temp = */ stream_read_int32(qtmovie->stream);//0x15000414 ????
maxBitrate = stream_read_int32(qtmovie->stream); /* maxBitrate = */ stream_read_int32(qtmovie->stream);
avgBitrate = stream_read_int32(qtmovie->stream); /* avgBitrate = */ stream_read_int32(qtmovie->stream);
DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType,
(long)maxBitrate,(long)avgBitrate);
/* get and verify DecSpecificInfoTag */ /* get and verify DecSpecificInfoTag */
if (stream_read_uint8(qtmovie->stream) != 0x05) if (stream_read_uint8(qtmovie->stream) != 0x05)

View file

@ -110,7 +110,6 @@ static mpc_status check_streaminfo(mpc_streaminfo * si)
mpc_status mpc_status
streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r) streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r)
{ {
mpc_uint16_t Estimatedpeak_title = 0;
mpc_uint32_t frames, last_frame_samples; mpc_uint32_t frames, last_frame_samples;
si->bitrate = 0; si->bitrate = 0;
@ -124,7 +123,7 @@ streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r)
*/ */
mpc_bits_read(r, 2); // Link ? mpc_bits_read(r, 2); // Link ?
si->sample_freq = samplefreqs[mpc_bits_read(r, 2)]; si->sample_freq = samplefreqs[mpc_bits_read(r, 2)];
Estimatedpeak_title = (mpc_uint16_t) mpc_bits_read(r, 16); // read the ReplayGain data mpc_bits_read(r, 16); // Estimatedpeak_title
si->gain_title = (mpc_uint16_t) mpc_bits_read(r, 16); si->gain_title = (mpc_uint16_t) mpc_bits_read(r, 16);
si->peak_title = (mpc_uint16_t) mpc_bits_read(r, 16); si->peak_title = (mpc_uint16_t) mpc_bits_read(r, 16);
si->gain_album = (mpc_uint16_t) mpc_bits_read(r, 16); si->gain_album = (mpc_uint16_t) mpc_bits_read(r, 16);