History

all: Remove unused-but-set variables

Newer versions of Clang detect this and emit warnings for it.

Andreas Rheinhardt committed 4 years ago

Commit 01d158d1 parent a4798a58 files · +3 −27Browse files

Unified · Split

8 files
  1. libavcodec/aaccoder.c +1 −2
  2. libavcodec/cinepakenc.c +0 −3
  3. libavcodec/error_resilience.c +0 −3
  4. libavcodec/imc.c +2 −3
  5. libavcodec/j2kenc.c +0 −2
  6. libavcodec/roqvideoenc.c +0 −2
  7. libavfilter/af_astats.c +0 −4
  8. libswresample/tests/swresample.c +0 −8
libavcodec/aaccoder.c+1−2
@@ -414,11 +414,10 @@ static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s, · 413 unmodified lines
414414 start = 0;
415415 for (g = 0; g < sce->ics.num_swb; g++) {
416416 int nz = 0;
417− float uplim = 0.0f, energy = 0.0f;
417+ float uplim = 0.0f;
418418 for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
419419 FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g];
420420 uplim += band->threshold;
421− energy += band->energy;
422421 if (band->energy <= band->threshold || band->threshold == 0.0f) {
423422 sce->zeroes[(w+w2)*16+g] = 1;
424423 continue;
libavcodec/cinepakenc.c+0−3
@@ -705,7 +705,6 @@ static int quantize(CinepakEncContext *s, int h, uint8_t *data[4], · 704 unmodified lines
705705 int entry_size = s->pix_fmt == AV_PIX_FMT_RGB24 ? 6 : 4;
706706 int *codebook = v1mode ? info->v1_codebook : info->v4_codebook;
707707 int size = v1mode ? info->v1_size : info->v4_size;
708− int64_t total_error = 0;
709708 uint8_t vq_pict_buf[(MB_AREA * 3) / 2];
710709 uint8_t *sub_data[4], *vq_data[4];
711710 int sub_linesize[4], vq_linesize[4];
@@ -795,7 +794,6 @@ static int quantize(CinepakEncContext *s, int h, uint8_t *data[4], · 83 unmodified lines
795794
796795 mb->v1_error = compute_mb_distortion(s, sub_data, sub_linesize,
797796 vq_data, vq_linesize);
798− total_error += mb->v1_error;
799797 } else {
800798 for (k = 0; k < 4; k++)
801799 mb->v4_vector[k] = s->codebook_closest[i + k];
@@ -805,7 +803,6 @@ static int quantize(CinepakEncContext *s, int h, uint8_t *data[4], · 3 unmodified lines
805803
806804 mb->v4_error = compute_mb_distortion(s, sub_data, sub_linesize,
807805 vq_data, vq_linesize);
808− total_error += mb->v4_error;
809806 }
810807 i += v1mode ? 1 : 4;
811808 }
libavcodec/error_resilience.c+0−3
@@ -476,8 +476,6 @@ static void guess_mv(ERContext *s) · 475 unmodified lines
476476 none_left = 1;
477477 changed = 1;
478478 for (pass = 0; (changed || pass < 2) && pass < 10; pass++) {
479− int score_sum = 0;
480−
481479 changed = 0;
482480 for (blocklist_index = 0; blocklist_index < blocklist_length; blocklist_index++) {
483481 const int mb_x = blocklist[blocklist_index][0];
@@ -668,7 +666,6 @@ skip_mean_and_median: · 184 unmodified lines
668666 best_pred = j;
669667 }
670668 }
671− score_sum += best_score;
672669 s->mv[0][0][0] = mv_predictor[best_pred][0];
673670 s->mv[0][0][1] = mv_predictor[best_pred][1];
674671
libavcodec/imc.c+2−3
@@ -829,7 +829,7 @@ static void imc_get_coeffs(AVCodecContext *avctx, · 828 unmodified lines
829829 static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx)
830830 {
831831 int i, j;
832− int bits, summer;
832+ int summer;
833833
834834 for (i = 0; i < BANDS; i++) {
835835 chctx->sumLenArr[i] = 0;
@@ -853,7 +853,7 @@ static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx) · 17 unmodified lines
853853 }
854854
855855 /* calculate bits left, bits needed and adjust bit allocation */
856− bits = summer = 0;
856+ summer = 0;
857857
858858 for (i = 0; i < BANDS; i++) {
859859 if (chctx->bandFlagsBuf[i]) {
@@ -863,7 +863,6 @@ static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx) · 3 unmodified lines
863863 chctx->CWlengthT[j] = 0;
864864 }
865865 }
866− bits += chctx->skipFlagBits[i];
867866 summer -= chctx->skipFlagBits[i];
868867 }
869868 }
libavcodec/j2kenc.c+0−2
@@ -1272,7 +1272,6 @@ static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) · 1271 unmodified lines
12721272 double min = DBL_MAX;
12731273 double max = 0;
12741274 double thresh;
1275− int tile_disto = 0;
12761275
12771276 Jpeg2000CodingStyle *codsty = &s->codsty;
12781277
@@ -1294,7 +1293,6 @@ static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) · 15 unmodified lines
12941293 int dr;
12951294 double dd, drslope;
12961295
1297− tile_disto += pass->disto;
12981296 if (passno == 0) {
12991297 dr = (int32_t)pass->rate;
13001298 dd = pass->disto;
libavcodec/roqvideoenc.c+0−2
@@ -666,7 +666,6 @@ static void reconstruct_and_encode_image(RoqEncContext *enc, · 665 unmodified lines
666666 int i, j, k;
667667 int x, y;
668668 int subX, subY;
669− int dist=0;
670669
671670 roq_qcell *qcell;
672671 CelEvaluation *eval;
@@ -692,7 +691,6 @@ static void reconstruct_and_encode_image(RoqEncContext *enc, · 19 unmodified lines
692691
693692 x = eval->sourceX;
694693 y = eval->sourceY;
695− dist += eval->eval_dist[eval->best_coding];
696694
697695 switch (eval->best_coding) {
698696 case RoQ_ID_MOT:
libavfilter/af_astats.c+0−4
@@ -403,7 +403,6 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) · 402 unmodified lines
403403 max_sigma_x = 0,
404404 diff1_sum = 0,
405405 diff1_sum_x2 = 0,
406− sigma_x = 0,
407406 sigma_x2 = 0,
408407 noise_floor = 0,
409408 entropy = 0,
@@ -428,7 +427,6 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) · 18 unmodified lines
428427 diff1_sum_x2 += p->diff1_sum_x2;
429428 min_sigma_x2 = FFMIN(min_sigma_x2, p->min_sigma_x2);
430429 max_sigma_x2 = FFMAX(max_sigma_x2, p->max_sigma_x2);
431− sigma_x += p->sigma_x;
432430 sigma_x2 += p->sigma_x2;
433431 noise_floor = FFMAX(noise_floor, p->noise_floor);
434432 noise_floor_count += p->noise_floor_count;
@@ -659,7 +657,6 @@ static void print_stats(AVFilterContext *ctx) · 224 unmodified lines
659657 max_sigma_x = 0,
660658 diff1_sum_x2 = 0,
661659 diff1_sum = 0,
662− sigma_x = 0,
663660 sigma_x2 = 0,
664661 noise_floor = 0,
665662 entropy = 0,
@@ -684,7 +681,6 @@ static void print_stats(AVFilterContext *ctx) · 18 unmodified lines
684681 diff1_sum += p->diff1_sum;
685682 min_sigma_x2 = FFMIN(min_sigma_x2, p->min_sigma_x2);
686683 max_sigma_x2 = FFMAX(max_sigma_x2, p->max_sigma_x2);
687− sigma_x += p->sigma_x;
688684 sigma_x2 += p->sigma_x2;
689685 noise_floor = FFMAX(noise_floor, p->noise_floor);
690686 p->entropy = calc_entropy(s, p);
libswresample/tests/swresample.c+0−8
@@ -362,16 +362,12 @@ int main(int argc, char **argv){ · 361 unmodified lines
362362
363363 for(ch=0; ch<in_ch_count; ch++){
364364 double sse, maxdiff=0;
365− double sum_a= 0;
366− double sum_b= 0;
367365 double sum_aa= 0;
368366 double sum_bb= 0;
369367 double sum_ab= 0;
370368 for(i=0; i<out_count; i++){
371369 double a= get(ain , ch, i, in_ch_count, in_sample_fmt);
372370 double b= get(aout, ch, i, in_ch_count, in_sample_fmt);
373− sum_a += a;
374− sum_b += b;
375371 sum_aa+= a*a;
376372 sum_bb+= b*b;
377373 sum_ab+= a*b;
@@ -392,16 +388,12 @@ int main(int argc, char **argv){ · 14 unmodified lines
392388 if(flush_count){
393389 for(ch=0; ch<in_ch_count; ch++){
394390 double sse, maxdiff=0;
395− double sum_a= 0;
396− double sum_b= 0;
397391 double sum_aa= 0;
398392 double sum_bb= 0;
399393 double sum_ab= 0;
400394 for(i=0; i<flush_count; i++){
401395 double a= get(ain , ch, i+out_count, in_ch_count, in_sample_fmt);
402396 double b= get(aout, ch, i, in_ch_count, in_sample_fmt);
403− sum_a += a;
404− sum_b += b;
405397 sum_aa+= a*a;
406398 sum_bb+= b*b;
407399 sum_ab+= a*b;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t