[FFmpeg-cvslog] Drop unnecessary av_uninit attributes from some variable declarations.

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Feb 13 08:24:00 2012 +0100| [a8798c7eb934055d6aae51c6c7627559c33317d8] | committer: Diego Biurrun

Drop unnecessary av_uninit attributes from some variable declarations.

Recent versions of gcc (4.4+) no longer give false positive warnings.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8798c7eb934055d6aae51c6c7627559c33317d8
---

 libavcodec/ac3enc.c          |    6 ++----
 libavcodec/ac3enc_template.c |    2 +-
 libavcodec/eatgv.c           |    2 +-
 libavcodec/flacdec.c         |    2 +-
 libavcodec/msrledec.c        |    4 ++--
 libavcodec/qtrleenc.c        |    2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index b8e23e4..3bf5f94 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1386,8 +1386,7 @@ static void ac3_output_frame_header(AC3EncodeContext *s)
  */
 static void output_audio_block(AC3EncodeContext *s, int blk)
 {
-    int ch, i, baie, bnd, got_cpl;
-    int av_uninit(ch0);
+    int ch, i, baie, bnd, got_cpl, ch0;
     AC3Block *block = &s->blocks[blk];
 
     /* block switching */
@@ -2236,8 +2235,7 @@ static av_cold int validate_options(AC3EncodeContext *s)
  */
 static av_cold void set_bandwidth(AC3EncodeContext *s)
 {
-    int blk, ch;
-    int av_uninit(cpl_start);
+    int blk, ch, cpl_start;
 
     if (s->cutoff) {
         /* calculate bandwidth based on user-specified cutoff frequency */
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index 3396ed1..bc06c2f 100644
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -335,7 +335,7 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s)
 {
     int nb_coefs;
     int blk, bnd, i;
-    AC3Block *block, *av_uninit(block0);
+    AC3Block *block, *block0;
 
     if (s->channel_mode != AC3_CHMODE_STEREO)
         return;
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index ccdb35e..025188b 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -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) {
     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;
 
     if (src[0] & 0x01)
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 58eb66d..2b7f7ee 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -288,7 +288,7 @@ static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order)
 {
     const int blocksize = s->blocksize;
     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 */
     for (i = 0; i < pred_order; i++) {
diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c
index 4714772..9854d82 100644
--- a/libavcodec/msrledec.c
+++ b/libavcodec/msrledec.c
@@ -134,8 +134,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
     uint8_t *output, *output_end;
     const uint8_t* src = data;
     int p1, p2, line=avctx->height - 1, pos=0, i;
-    uint16_t av_uninit(pix16);
-    uint32_t av_uninit(pix32);
+    uint16_t pix16;
+    uint32_t pix32;
     unsigned int width= FFABS(pic->linesize[0]) / (depth >> 3);
 
     output     = pic->data[0] + (avctx->height - 1) * pic->linesize[0];
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index ede03d2..3ffce2b 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -120,7 +120,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t
     unsigned int skipcount;
     /* This will be the number of consecutive equal pixels in the current
      * frame, starting from the ith one also */
-    unsigned int av_uninit(repeatcount);
+    unsigned int repeatcount;
 
     /* The cost of the three different possibilities */
     int total_bulk_cost;