summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-04-27 17:59:49 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-04-27 17:59:49 +0000
commitfa65362a42675d9d84a7ec57fdf5d8e1b575a4cd (patch)
tree860ef46fabe4e3fb94b621cded350193e2119131
parent4170ac8ac6393ad7bafd3f88f88cdf33c533bd08 (diff)
downloadrockbox-fa65362a42675d9d84a7ec57fdf5d8e1b575a4cd.tar.gz
rockbox-fa65362a42675d9d84a7ec57fdf5d8e1b575a4cd.tar.bz2
rockbox-fa65362a42675d9d84a7ec57fdf5d8e1b575a4cd.zip
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
-rw-r--r--apps/codecs/libm4a/demux.c16
-rw-r--r--apps/codecs/libmusepack/streaminfo.c3
2 files changed, 6 insertions, 13 deletions
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c
index 995dd94a07..7b09074c52 100644
--- a/apps/codecs/libm4a/demux.c
+++ b/apps/codecs/libm4a/demux.c
@@ -55,7 +55,6 @@ typedef struct
static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
{
fourcc_t type;
- uint32_t minor_ver;
size_t size_remaining = chunk_len - 8;
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");
return;
}
- minor_ver = stream_read_uint32(qtmovie->stream);
+ /* minor_ver = */ stream_read_uint32(qtmovie->stream);
size_remaining-=4;
/* compatible brands */
@@ -104,9 +103,6 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len)
{
uint8_t tag;
uint32_t temp;
- int audioType;
- int32_t maxBitrate;
- int32_t avgBitrate;
(void)chunk_len;
/* 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);
if (temp < 13) return false;
- audioType = stream_read_uint8(qtmovie->stream);
- temp=stream_read_int32(qtmovie->stream);//0x15000414 ????
- maxBitrate = stream_read_int32(qtmovie->stream);
- avgBitrate = stream_read_int32(qtmovie->stream);
- DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType,
- (long)maxBitrate,(long)avgBitrate);
+ /* audioType = */ stream_read_uint8(qtmovie->stream);
+ /* temp = */ stream_read_int32(qtmovie->stream);//0x15000414 ????
+ /* maxBitrate = */ stream_read_int32(qtmovie->stream);
+ /* avgBitrate = */ stream_read_int32(qtmovie->stream);
/* get and verify DecSpecificInfoTag */
if (stream_read_uint8(qtmovie->stream) != 0x05)
diff --git a/apps/codecs/libmusepack/streaminfo.c b/apps/codecs/libmusepack/streaminfo.c
index 2d8ece704a..3303bc4d7d 100644
--- a/apps/codecs/libmusepack/streaminfo.c
+++ b/apps/codecs/libmusepack/streaminfo.c
@@ -110,7 +110,6 @@ static mpc_status check_streaminfo(mpc_streaminfo * si)
mpc_status
streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r)
{
- mpc_uint16_t Estimatedpeak_title = 0;
mpc_uint32_t frames, last_frame_samples;
si->bitrate = 0;
@@ -124,7 +123,7 @@ streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r)
*/
mpc_bits_read(r, 2); // Link ?
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->peak_title = (mpc_uint16_t) mpc_bits_read(r, 16);
si->gain_album = (mpc_uint16_t) mpc_bits_read(r, 16);