[FFmpeg-devel] [PATCH 1/8] avformat/bintext: Remove set-but-unused variable

[FFmpeg-devel] [PATCH 1/8] avformat/bintext: Remove set-but-unused variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Maybe this was meant to be used somehow?

 libavformat/bintext.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index 0465b86f4b..b6f14a03e5 100644
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -132,8 +132,6 @@ static int bin_probe(const AVProbeData *p)
 {
     const uint8_t *d = p->buf;
     int magic = 0, sauce = 0;
-    int invisible = 0;
-    int i;
 
     if (p->buf_size > 256)
         magic = !memcmp(d + p->buf_size - 256, next_magic, sizeof(next_magic));
@@ -157,12 +155,6 @@ static int bin_probe(const AVProbeData *p)
         if (par.height <= 0)
             return 0;
 
-        for (i = 0; i < p->buf_size - 256;  i+=2) {
-            if ((d[i+1] & 15) == (d[i+1] >> 4) && d[i] && d[i] != 0xFF && d[i] != ' ') {
-                invisible ++;
-            }
-        }
-
         if (par.width * par.height * 2 / (8*16) == p->buf_size)
             return AVPROBE_SCORE_MAX / 2;
         return 0;
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/8] avformat/mlpdec: Remove unused-but-set variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/mlpdec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/mlpdec.c b/libavformat/mlpdec.c
index 4834f697f3..f4fed65851 100644
--- a/libavformat/mlpdec.c
+++ b/libavformat/mlpdec.c
@@ -34,12 +34,11 @@
 static int av_always_inline mlp_thd_probe(const AVProbeData *p, uint32_t sync)
 {
     const uint8_t *buf, *last_buf = p->buf, *end = p->buf + p->buf_size;
-    int frames = 0, valid = 0, size = 0;
+    int valid = 0, size = 0;
     int nsubframes = 0;
 
     for (buf = p->buf; buf + 8 <= end; buf++) {
         if (AV_RB32(buf + 4) == sync) {
-            frames++;
             if (last_buf + size == buf) {
                 valid += 1 + nsubframes / 8;
             }
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/8] avfilter/vf_atadenoise: Remove unused-but-set variables

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/vf_atadenoise.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libavfilter/vf_atadenoise.c b/libavfilter/vf_atadenoise.c
index 54cde782f6..2178c62faf 100644
--- a/libavfilter/vf_atadenoise.c
+++ b/libavfilter/vf_atadenoise.c
@@ -154,7 +154,6 @@ static void fweight_row##name(const uint8_t *ssrc, uint8_t *ddst,           \
        unsigned ldiff, rdiff;                                               \
        float sum = srcx;                                                    \
        float wsum = 1.f;                                                    \
-       int l = 0, r = 0;                                                    \
        int srcjx, srcix;                                                    \
                                                                             \
        for (int j = mid - 1, i = mid + 1; j >= 0 && i < size; j--, i++) {   \
@@ -165,7 +164,6 @@ static void fweight_row##name(const uint8_t *ssrc, uint8_t *ddst,           \
            if (ldiff > thra ||                                              \
                lsumdiff > thrb)                                             \
                break;                                                       \
-           l++;                                                             \
            sum += srcjx * weights[j];                                       \
            wsum += weights[j];                                              \
                                                                             \
@@ -176,7 +174,6 @@ static void fweight_row##name(const uint8_t *ssrc, uint8_t *ddst,           \
            if (rdiff > thra ||                                              \
                rsumdiff > thrb)                                             \
                break;                                                       \
-           r++;                                                             \
            sum += srcix * weights[i];                                       \
            wsum += weights[i];                                              \
        }                                                                    \
@@ -205,7 +202,6 @@ static void fweight_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst,  \
        unsigned ldiff, rdiff;                                               \
        float sum = srcx;                                                    \
        float wsum = 1.f;                                                    \
-       int l = 0, r = 0;                                                    \
        int srcjx, srcix;                                                    \
                                                                             \
        for (int j = mid - 1; j >= 0; j--) {                                 \
@@ -216,7 +212,6 @@ static void fweight_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst,  \
            if (ldiff > thra ||                                              \
                lsumdiff > thrb)                                             \
                break;                                                       \
-           l++;                                                             \
            sum += srcjx * weights[j];                                       \
            wsum += weights[j];                                              \
        }                                                                    \
@@ -229,7 +224,6 @@ static void fweight_row##name##_serial(const uint8_t *ssrc, uint8_t *ddst,  \
            if (rdiff > thra ||                                              \
                rsumdiff > thrb)                                             \
                break;                                                       \
-           r++;                                                             \
            sum += srcix * weights[i];                                       \
            wsum += weights[i];                                              \
        }                                                                    \
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/8] avcodec/hevc_ps: Remove unused-but-set variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/hevc_ps.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index a955f585d9..0a122a2d6c 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -122,7 +122,6 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx,
     uint8_t rps_predict = 0;
     int delta_poc;
     int k0 = 0;
-    int k1 = 0;
     int k  = 0;
     int i;
 
@@ -172,8 +171,6 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx,
                 rps->delta_poc[k] = delta_poc;
                 if (delta_poc < 0)
                     k0++;
-                else
-                    k1++;
                 k++;
             }
         }
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 5/8] avcodec/imc: Remove unused-but-set variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/imc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 94b9ac674c..978ea74b74 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -877,7 +877,7 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
     int imc_hdr, i, j, ret;
     int flag;
     int bits;
-    int counter, bitscount;
+    int bitscount;
     IMCChannel *chctx = q->chctx + ch;
 
 
@@ -926,7 +926,6 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
 
     memcpy(chctx->old_floor, chctx->flcoeffs1, 32 * sizeof(float));
 
-    counter = 0;
     if (stream_format_code & 0x1) {
         for (i = 0; i < BANDS; i++) {
             chctx->bandWidthT[i]   = band_tab[i + 1] - band_tab[i];
@@ -938,7 +937,6 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
         for (i = 0; i < BANDS; i++) {
             if (chctx->levlCoeffBuf[i] == 16) {
                 chctx->bandWidthT[i] = 0;
-                counter++;
             } else
                 chctx->bandWidthT[i] = band_tab[i + 1] - band_tab[i];
         }
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 6/8] avcodec/j2kenc: Remove unused-but-set variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/j2kenc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index 0b761d0b00..ce77a6d964 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -288,13 +288,11 @@ static void tag_tree_code(Jpeg2000EncoderContext *s, Jpeg2000TgtNode *node, int
 /** update the value in node */
 static void tag_tree_update(Jpeg2000TgtNode *node)
 {
-    int lev = 0;
     while (node->parent){
         if (node->parent->val <= node->val)
             break;
         node->parent->val = node->val;
         node = node->parent;
-        lev++;
     }
 }
 
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 7/8] avcodec/qoidec: Remove unused-but-set variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/qoidec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/qoidec.c b/libavcodec/qoidec.c
index 8a119f7606..1e052f659b 100644
--- a/libavcodec/qoidec.c
+++ b/libavcodec/qoidec.c
@@ -69,10 +69,9 @@ static int qoi_decode_frame(AVCodecContext *avctx, AVFrame *p,
 
     dst = p->data[0];
     len = width * height * channels;
-    for (int n = 0, off_x = 0, off_y = 0; n < len; n += channels, off_x++) {
+    for (int n = 0, off_x = 0; n < len; n += channels, off_x++) {
         if (off_x >= width) {
             off_x = 0;
-            off_y++;
             dst += p->linesize[0];
         }
         if (run > 0) {
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 8/8] avcodec/tests/snowenc: Remove unused-but-set variable

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/tests/snowenc.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libavcodec/tests/snowenc.c b/libavcodec/tests/snowenc.c
index 07af1f2cf9..146f9fae51 100644
--- a/libavcodec/tests/snowenc.c
+++ b/libavcodec/tests/snowenc.c
@@ -118,11 +118,6 @@ int main(void){
             int w= width  >> (s.spatial_decomposition_count-level);
             //int h= height >> (s.spatial_decomposition_count-level);
             int stride= width  << (s.spatial_decomposition_count-level);
-            DWTELEM *buf= buffer[0];
-            int64_t error=0;
-
-            buf+=w;
-            buf+=stride>>1;
 
             memset(buffer[0], 0, sizeof(int)*width*height);
             for(y=0; y<height; y++){
@@ -135,7 +130,6 @@ int main(void){
             for(y=0; y<height; y++){
                 for(x=0; x<width; x++){
                     int64_t d= buffer[0][x + y*width];
-                    error += d*d;
                     if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9) printf("%8"PRId64" ", d);
                 }
                 if(FFABS(height/2-y)<9) printf("\n");
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/8] avformat/bintext: Remove set-but-unused variable

[Paul B Mahol]

On Tue, Jun 28, 2022 at 1:27 PM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> Maybe this was meant to be used somehow?
>

probably some not implemented logic to set probe depending on amount of
invisible chars.

>
>  libavformat/bintext.c | 8 --------
>  1 file changed, 8 deletions(-)
>
> diff --git a/libavformat/bintext.c b/libavformat/bintext.c
> index 0465b86f4b..b6f14a03e5 100644
> --- a/libavformat/bintext.c
> +++ b/libavformat/bintext.c
> @@ -132,8 +132,6 @@ static int bin_probe(const AVProbeData *p)
>  {
>      const uint8_t *d = p->buf;
>      int magic = 0, sauce = 0;
> -    int invisible = 0;
> -    int i;
>
>      if (p->buf_size > 256)
>          magic = !memcmp(d + p->buf_size - 256, next_magic,
> sizeof(next_magic));
> @@ -157,12 +155,6 @@ static int bin_probe(const AVProbeData *p)
>          if (par.height <= 0)
>              return 0;
>
> -        for (i = 0; i < p->buf_size - 256;  i+=2) {
> -            if ((d[i+1] & 15) == (d[i+1] >> 4) && d[i] && d[i] != 0xFF &&
> d[i] != ' ') {
> -                invisible ++;
> -            }
> -        }
> -
>          if (par.width * par.height * 2 / (8*16) == p->buf_size)
>              return AVPROBE_SCORE_MAX / 2;
>          return 0;
> --
> 2.34.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/8] avformat/bintext: Remove set-but-unused variable

[Andreas Rheinhardt]

Paul B Mahol:
> On Tue, Jun 28, 2022 at 1:27 PM Andreas Rheinhardt <
> andreas.rheinhardt@outlook.com> wrote:
> 
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> Maybe this was meant to be used somehow?
>>
> 
> probably some not implemented logic to set probe depending on amount of
> invisible chars.
> 

Yeah, probably. Anyway, no one bothered to implement it, so I will
remove it tomorrow when I apply this patchset.

- Andreas

>>
>>  libavformat/bintext.c | 8 --------
>>  1 file changed, 8 deletions(-)
>>
>> diff --git a/libavformat/bintext.c b/libavformat/bintext.c
>> index 0465b86f4b..b6f14a03e5 100644
>> --- a/libavformat/bintext.c
>> +++ b/libavformat/bintext.c
>> @@ -132,8 +132,6 @@ static int bin_probe(const AVProbeData *p)
>>  {
>>      const uint8_t *d = p->buf;
>>      int magic = 0, sauce = 0;
>> -    int invisible = 0;
>> -    int i;
>>
>>      if (p->buf_size > 256)
>>          magic = !memcmp(d + p->buf_size - 256, next_magic,
>> sizeof(next_magic));
>> @@ -157,12 +155,6 @@ static int bin_probe(const AVProbeData *p)
>>          if (par.height <= 0)
>>              return 0;
>>
>> -        for (i = 0; i < p->buf_size - 256;  i+=2) {
>> -            if ((d[i+1] & 15) == (d[i+1] >> 4) && d[i] && d[i] != 0xFF &&
>> d[i] != ' ') {
>> -                invisible ++;
>> -            }
>> -        }
>> -
>>          if (par.width * par.height * 2 / (8*16) == p->buf_size)
>>              return AVPROBE_SCORE_MAX / 2;
>>          return 0;
>> --
>> 2.34.1
>>

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".