diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 7a6bcf7900..4d3049f012 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1482,7 +1482,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, av_uninit(ch0);
+    int ch, i, baie, bnd, got_cpl, ch0;
     AC3Block *block = &s->blocks[blk];
 
     /* block switching */
@@ -2383,7 +2383,7 @@ static av_cold int validate_options(AC3EncodeContext *s)
  */
 static av_cold void set_bandwidth(AC3EncodeContext *s)
 {
-    int blk, ch, 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 45dbc98804..ea0402fac4 100644
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -117,7 +117,7 @@ static void apply_channel_coupling(AC3EncodeContext *s)
 #else
     int32_t (*fixed_cpl_coords)[AC3_MAX_CHANNELS][16] = cpl_coords;
 #endif
-    int av_uninit(blk), ch, bnd, i, j;
+    int blk, ch, bnd, i, j;
     CoefSumType energy[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][16] = {{{0}}};
     int cpl_start, num_cpl_coefs;
 
@@ -231,7 +231,7 @@ static void apply_channel_coupling(AC3EncodeContext *s)
     for (bnd = 0; bnd < s->num_cpl_bands; bnd++) {
         blk = 0;
         while (blk < s->num_blocks) {
-            int av_uninit(blk1);
+            int blk1;
             AC3Block *block  = &s->blocks[blk];
 
             if (!block->cpl_in_use) {
diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c
index 58158f6eee..ef5dd0ce85 100644
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@@ -103,7 +103,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     while (dst != frame_end) {
         static const uint8_t lentab[4] = { 0, 2, 0, 1 };
-        unsigned int byte   = bytestream2_get_byte(&g), av_uninit(offset);
+        unsigned int byte   = bytestream2_get_byte(&g), offset;
         unsigned int code   = byte >> 6;
         unsigned int length = byte & ~0xC0;
 
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index c6110c29ff..c312da8afc 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -123,7 +123,7 @@ static void count_colors(AVCodecContext *avctx, unsigned hits[33],
     unsigned count[256] = { 0 };
     uint32_t *palette = (uint32_t *)r->data[1];
     uint32_t color;
-    int x, y, i, j, match, d, best_d, av_uninit(best_j);
+    int x, y, i, j, match, d, best_d, best_j;
     uint8_t *p = r->data[0];
 
     for (y = 0; y < r->h; y++) {
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 1c3f97653c..12a0f50124 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -205,7 +205,7 @@ static int decode_motion(GetBitContext *gb)
 static int decode_mb(MadContext *s, AVFrame *frame, int inter)
 {
     int mv_map = 0;
-    int av_uninit(mv_x), av_uninit(mv_y);
+    int mv_x, mv_y;
     int j;
 
     if (inter) {
diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c
index 8953dbe07c..e8350d4862 100644
--- a/libavcodec/ffv1enc_template.c
+++ b/libavcodec/ffv1enc_template.c
@@ -148,7 +148,7 @@ static int RENAME(encode_rgb_frame)(FFV1Context *s, const uint8_t *src[4],
                 sample[p][i]= RENAME(s->sample_buffer) + p*ring_size*(w+6) + ((h+i-y)%ring_size)*(w+6) + 3;
 
         for (x = 0; x < w; x++) {
-            int b, g, r, av_uninit(a);
+            int b, g, r, a;
             if (lbd) {
                 unsigned v = *((const uint32_t*)(src[0] + x*4 + stride[0]*y));
                 b =  v        & 0xFF;
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 91bbdc657d..9d2f390647 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -303,7 +303,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded,
                                  int pred_order, int bps)
 {
     const int blocksize = s->blocksize;
-    unsigned av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d);
+    unsigned a, b, c, d;
     int i;
     int ret;
 
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index 8305cc0596..f07cb0e039 100644
--- a/libavcodec/lpc.c
+++ b/libavcodec/lpc.c
@@ -279,7 +279,7 @@ int ff_lpc_calc_coefs(LPCContext *s,
     if (lpc_type == FF_LPC_TYPE_CHOLESKY) {
         LLSModel *m = s->lls_models;
         LOCAL_ALIGNED(32, double, var, [FFALIGN(MAX_LPC_ORDER+1,4)]);
-        double av_uninit(weight);
+        double weight;
         memset(var, 0, FFALIGN(MAX_LPC_ORDER+1,4)*sizeof(*var));
 
         for(j=0; j<max_order; j++)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 07de5d6d91..113d79bd5e 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1291,7 +1291,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block,
 {
     MpegEncContext *s = &ctx->m;
     int level, i, last, run, qmul, qadd;
-    int av_uninit(dc_pred_dir);
+    int dc_pred_dir;
     RLTable *rl;
     RL_VLC_ELEM *rl_vlc;
     const uint8_t *scan_table;
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index bf1e4877bd..7370251e09 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -626,7 +626,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
                               int n, int coded, const uint8_t *scan_table)
 {
     int level, i, last, run, run_diff;
-    int av_uninit(dc_pred_dir);
+    int dc_pred_dir;
     RLTable *rl;
     RL_VLC_ELEM *rl_vlc;
     int qmul, qadd;
diff --git a/libavcodec/ppc/mpegaudiodsp_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c
index b065203c4e..bb962fba23 100644
--- a/libavcodec/ppc/mpegaudiodsp_altivec.c
+++ b/libavcodec/ppc/mpegaudiodsp_altivec.c
@@ -55,7 +55,7 @@ static void apply_window(const float *buf, const float *win1,
     const vector float *bufa  = (const vector float *) buf;
     vector float *sum1a = (vector float *) sum1;
     vector float *sum2a = (vector float *) sum2;
-    vector float av_uninit(v0), av_uninit(v4);
+    vector float v0, v4;
     vector float v1, v2, v3;
 
     len = len >> 2;
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index 71d57d7eb8..c1273af30b 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -145,7 +145,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui
     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_skip_cost;
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c
index 92c35ac12c..1b22113dd3 100644
--- a/libavcodec/ra144enc.c
+++ b/libavcodec/ra144enc.c
@@ -192,8 +192,8 @@ static void create_adapt_vect(float *vect, const int16_t *cb, int lag)
 static int adaptive_cb_search(const int16_t *adapt_cb, float *work,
                               const float *coefs, float *data)
 {
-    int i, av_uninit(best_vect);
-    float score, gain, best_score, av_uninit(best_gain);
+    int i, best_vect;
+    float score, gain, best_score, best_gain;
     float exc[BLOCKSIZE];
 
     gain = best_score = 0;
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 539b5c5395..0b76a60d16 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -2656,7 +2656,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame,
     VP8Context *s = avctx->priv_data;
     int ret, i, referenced, num_jobs;
     enum AVDiscard skip_thresh;
-    VP8Frame *av_uninit(curframe), *prev_frame;
+    VP8Frame *curframe, *prev_frame;
 
     if (is_vp7)
         ret = vp7_decode_frame_header(s, avpkt->data, avpkt->size);
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 258c71330c..f693afd8de 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -1500,8 +1500,8 @@ static int synth_frame(AVCodecContext *ctx, GetBitContext *gb, int frame_idx,
                        float *excitation, float *synth)
 {
     WMAVoiceContext *s = ctx->priv_data;
-    int n, n_blocks_x2, log_n_blocks_x2, av_uninit(cur_pitch_val);
-    int pitch[MAX_BLOCKS], av_uninit(last_block_pitch);
+    int n, n_blocks_x2, log_n_blocks_x2, cur_pitch_val;
+    int pitch[MAX_BLOCKS], last_block_pitch;
 
     /* Parse frame type ("frame header"), see frame_descs */
     int bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc, 6, 3)], block_nsamples;
diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
index 68fa5aaf7b..7df149df94 100644
--- a/libavfilter/af_aecho.c
+++ b/libavfilter/af_aecho.c
@@ -165,7 +165,7 @@ static void echo_samples_## name ##p(AudioEchoContext *ctx,                 \
     const double in_gain = ctx->in_gain;                                    \
     const int nb_echoes = ctx->nb_echoes;                                   \
     const int max_samples = ctx->max_samples;                               \
-    int i, j, chan, av_uninit(index);                                       \
+    int i, j, chan, index;                                                  \
                                                                             \
     av_assert1(channels > 0); /* would corrupt delay_index */               \
                                                                             \
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index 880ee6241a..ad09db34df 100644
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -195,7 +195,7 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
     AVFilterLink *inlink = ctx->inputs[0];
     const int channels = inlink->ch_layout.nb_channels;
     const int nb_samples = frame->nb_samples;
-    int chan, i, av_uninit(dindex), oindex, av_uninit(count);
+    int chan, i, dindex, oindex, count;
     AVFrame *out_frame   = NULL;
     int err;
 
diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c
index 982ef71814..cc42e22ddf 100644
--- a/libavfilter/vsrc_mandelbrot.c
+++ b/libavfilter/vsrc_mandelbrot.c
@@ -255,7 +255,7 @@ static void draw_mandelbrot(AVFilterContext *ctx, uint32_t *color, int linesize,
         }
 
         for(x=0; x<s->w; x++){
-            float av_uninit(epsilon);
+            float epsilon;
             const double cr=s->start_x+scale*(x-s->w/2);
             double zr=cr;
             double zi=ci;
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index f7f6fd4cab..e5cb8abbfa 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -588,7 +588,7 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
     int hit_end = 0;
     unsigned int chunk_type, chunk_size;
     int ret = 0, packet_read = 0, key = 0, vp6a;
-    int av_uninit(num_samples);
+    int num_samples;
 
     while ((!packet_read && !hit_end) || partial_packet) {
         chunk_type = avio_rl32(pb);
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 22a9b9e4a7..08d244b39d 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1197,8 +1197,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
     int stream_type=-1;
     int64_t next, pos, meta_pos;
     int64_t dts, pts = AV_NOPTS_VALUE;
-    int av_uninit(channels);
-    int av_uninit(sample_rate);
+    int channels;
+    int sample_rate;
     AVStream *st    = NULL;
     int last = -1;
     int orig_size;
diff --git a/libavformat/srtp.c b/libavformat/srtp.c
index 7e5a42e327..174cac7a82 100644
--- a/libavformat/srtp.c
+++ b/libavformat/srtp.c
@@ -128,8 +128,8 @@ int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr)
 {
     uint8_t iv[16] = { 0 }, hmac[20];
     int len = *lenptr;
-    int av_uninit(seq_largest);
-    uint32_t ssrc, av_uninit(roc);
+    int seq_largest;
+    uint32_t ssrc, roc;
     uint64_t index;
     int rtcp, hmac_size;
 
diff --git a/libavformat/tests/seek.c b/libavformat/tests/seek.c
index 94a72d9422..cb8dcbb9fb 100644
--- a/libavformat/tests/seek.c
+++ b/libavformat/tests/seek.c
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
     }
     for(i=0; ; i++){
         AVPacket pkt = { 0 };
-        AVStream *av_uninit(st);
+        AVStream *st;
         char ts_buf[60];
 
         if(ret>=0){
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 00856a5eca..5f01c89745 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -350,7 +350,7 @@ static const AVMetadataConv wav_metadata_conv[] = {
 /* wav input */
 static int wav_read_header(AVFormatContext *s)
 {
-    int64_t size, av_uninit(data_size);
+    int64_t size, data_size;
     int64_t sample_count = 0;
     int rf64 = 0, bw64 = 0;
     uint32_t tag;
diff --git a/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c
index a9d4cd29a3..54e1546bf9 100644
--- a/libpostproc/postprocess_altivec_template.c
+++ b/libpostproc/postprocess_altivec_template.c
@@ -227,8 +227,8 @@ static inline void doVertLowPass_altivec(uint8_t *src, int stride, PPContext *c)
     DECLARE_ALIGNED(16, short, qp)[8] = {c->QP};
     vector signed short vqp = vec_ld(0, qp);
     vector signed short vb0, vb1, vb2, vb3, vb4, vb5, vb6, vb7, vb8, vb9;
-    vector unsigned char vbA0, av_uninit(vbA1), av_uninit(vbA2), av_uninit(vbA3), av_uninit(vbA4), av_uninit(vbA5), av_uninit(vbA6), av_uninit(vbA7), av_uninit(vbA8), vbA9;
-    vector unsigned char vbB0, av_uninit(vbB1), av_uninit(vbB2), av_uninit(vbB3), av_uninit(vbB4), av_uninit(vbB5), av_uninit(vbB6), av_uninit(vbB7), av_uninit(vbB8), vbB9;
+    vector unsigned char vbA0, vbA1, vbA2, vbA3, vbA4, vbA5, vbA6, vbA7, vbA8, vbA9;
+    vector unsigned char vbB0, vbB1, vbB2, vbB3, vbB4, vbB5, vbB6, vbB7, vbB8, vbB9;
     vector unsigned char vbT0, vbT1, vbT2, vbT3, vbT4, vbT5, vbT6, vbT7, vbT8, vbT9;
     vector unsigned char perml0, perml1, perml2, perml3, perml4,
                          perml5, perml6, perml7, perml8, perml9;
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 2b2358d2cc..3689f95856 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -803,7 +803,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
     uint8_t *y_table;
     uint16_t *y_table16;
     uint32_t *y_table32;
-    int i, base, rbase, gbase, bbase, av_uninit(abase), needAlpha;
+    int i, base, rbase, gbase, bbase, abase, needAlpha;
     const int yoffs = (fullRange ? 384 : 326) + YUVRGB_TABLE_LUMA_HEADROOM;
     const int table_plane_size = 1024 + 2*YUVRGB_TABLE_LUMA_HEADROOM;
 
