diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-02-10 15:10:42 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-02-13 19:20:54 +0100 |
| commit | 6df5c528ca045ab4b65f2a529a8e8bd2642f47e5 (patch) | |
| tree | 553b52982dcb76a8158862571f1f9b7cc7106644 | |
| parent | 7331b6e718243c276d391898199e08ba3cdb9545 (diff) | |
| download | ffmpeg-6df5c528ca045ab4b65f2a529a8e8bd2642f47e5.tar.gz | |
Move some conditionally used variables into the block where they are used.
This allows dropping the av_unused argument from them.
| -rw-r--r-- | libavformat/asfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/nsvdec.c | 2 | ||||
| -rw-r--r-- | libavutil/sha.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index c5391a9d62..bae0eacd10 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -365,8 +365,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) /* This code assumes that extradata contains only palette */ /* This is true for all paletted codecs implemented in libavcodec */ if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { - int av_unused i; #if HAVE_BIGENDIAN + int i; for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) asf_st->palette[i] = av_bswap32(((uint32_t*)st->codec->extradata)[i]); #else diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 375463e96e..1a160c5de9 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -566,7 +566,6 @@ static int nsv_read_chunk(AVFormatContext *s, int fill_header) uint32_t vsize; uint16_t asize; uint16_t auxsize; - uint32_t av_unused auxtag; av_dlog(s, "%s(%d)\n", __FUNCTION__, fill_header); @@ -596,6 +595,7 @@ null_chunk_retry: av_dlog(s, "NSV CHUNK %d aux, %u bytes video, %d bytes audio\n", auxcount, vsize, asize); /* skip aux stuff */ for (i = 0; i < auxcount; i++) { + uint32_t auxtag; auxsize = avio_rl16(pb); auxtag = avio_rl32(pb); av_dlog(s, "NSV aux data: '%c%c%c%c', %d bytes\n", diff --git a/libavutil/sha.c b/libavutil/sha.c index 5af742dc48..cbe1608a26 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -181,7 +181,7 @@ static void sha256_transform(uint32_t *state, const uint8_t buffer[64]) { unsigned int i, a, b, c, d, e, f, g, h; uint32_t block[64]; - uint32_t T1, av_unused(T2); + uint32_t T1; a = state[0]; b = state[1]; @@ -193,6 +193,7 @@ static void sha256_transform(uint32_t *state, const uint8_t buffer[64]) h = state[7]; #if CONFIG_SMALL for (i = 0; i < 64; i++) { + uint32_t T2; if (i < 16) T1 = blk0(i); else |