Commit a8798c7e authored by Diego Biurrun's avatar Diego Biurrun

Drop unnecessary av_uninit attributes from some variable declarations.

Recent versions of gcc (4.4+) no longer give false positive warnings.
parent 5d561514
...@@ -1386,8 +1386,7 @@ static void ac3_output_frame_header(AC3EncodeContext *s) ...@@ -1386,8 +1386,7 @@ static void ac3_output_frame_header(AC3EncodeContext *s)
*/ */
static void output_audio_block(AC3EncodeContext *s, int blk) static void output_audio_block(AC3EncodeContext *s, int blk)
{ {
int ch, i, baie, bnd, got_cpl; int ch, i, baie, bnd, got_cpl, ch0;
int av_uninit(ch0);
AC3Block *block = &s->blocks[blk]; AC3Block *block = &s->blocks[blk];
/* block switching */ /* block switching */
...@@ -2236,8 +2235,7 @@ static av_cold int validate_options(AC3EncodeContext *s) ...@@ -2236,8 +2235,7 @@ static av_cold int validate_options(AC3EncodeContext *s)
*/ */
static av_cold void set_bandwidth(AC3EncodeContext *s) static av_cold void set_bandwidth(AC3EncodeContext *s)
{ {
int blk, ch; int blk, ch, cpl_start;
int av_uninit(cpl_start);
if (s->cutoff) { if (s->cutoff) {
/* calculate bandwidth based on user-specified cutoff frequency */ /* calculate bandwidth based on user-specified cutoff frequency */
......
...@@ -335,7 +335,7 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) ...@@ -335,7 +335,7 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s)
{ {
int nb_coefs; int nb_coefs;
int blk, bnd, i; int blk, bnd, i;
AC3Block *block, *av_uninit(block0); AC3Block *block, *block0;
if (s->channel_mode != AC3_CHMODE_STEREO) if (s->channel_mode != AC3_CHMODE_STEREO)
return; return;
......
...@@ -64,7 +64,7 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx){ ...@@ -64,7 +64,7 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx){
*/ */
static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) { static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) {
unsigned char *dst_end = dst + width*height; unsigned char *dst_end = dst + width*height;
int size, size1, size2, av_uninit(offset), run; int size, size1, size2, offset, run;
unsigned char *dst_start = dst; unsigned char *dst_start = dst;
if (src[0] & 0x01) if (src[0] & 0x01)
......
...@@ -288,7 +288,7 @@ static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order) ...@@ -288,7 +288,7 @@ static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order)
{ {
const int blocksize = s->blocksize; const int blocksize = s->blocksize;
int32_t *decoded = s->decoded[channel]; int32_t *decoded = s->decoded[channel];
int av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d), i; int a, b, c, d, i;
/* warm up samples */ /* warm up samples */
for (i = 0; i < pred_order; i++) { for (i = 0; i < pred_order; i++) {
......
...@@ -134,8 +134,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de ...@@ -134,8 +134,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
uint8_t *output, *output_end; uint8_t *output, *output_end;
const uint8_t* src = data; const uint8_t* src = data;
int p1, p2, line=avctx->height - 1, pos=0, i; int p1, p2, line=avctx->height - 1, pos=0, i;
uint16_t av_uninit(pix16); uint16_t pix16;
uint32_t av_uninit(pix32); uint32_t pix32;
unsigned int width= FFABS(pic->linesize[0]) / (depth >> 3); unsigned int width= FFABS(pic->linesize[0]) / (depth >> 3);
output = pic->data[0] + (avctx->height - 1) * pic->linesize[0]; output = pic->data[0] + (avctx->height - 1) * pic->linesize[0];
......
...@@ -120,7 +120,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t ...@@ -120,7 +120,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t
unsigned int skipcount; unsigned int skipcount;
/* This will be the number of consecutive equal pixels in the current /* This will be the number of consecutive equal pixels in the current
* frame, starting from the ith one also */ * frame, starting from the ith one also */
unsigned int av_uninit(repeatcount); unsigned int repeatcount;
/* The cost of the three different possibilities */ /* The cost of the three different possibilities */
int total_bulk_cost; int total_bulk_cost;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment