[FFmpeg-devel] [PATCH 2/3] Remove pointless if.

Reimar Döffinger Reimar.Doeffinger at gmx.de
Sat Sep 6 21:25:50 CEST 2014


A branch to avoid some calculation seems unlikely to have any benefits.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
---
 libswresample/rematrix.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 62662f8..5da3056 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -304,9 +304,7 @@ av_cold static int auto_matrix(SwrContext *s)
                 s->matrix[out_i][in_i]= matrix[i][j];
             else
                 s->matrix[out_i][in_i]= i == j && (in_ch_layout & out_ch_layout & (1ULL<<i));
-            if(s->matrix[out_i][in_i]){
-                sum += fabs(s->matrix[out_i][in_i]);
-            }
+            sum += fabs(s->matrix[out_i][in_i]);
             if(in_ch_layout & (1ULL<<j))
                 in_i++;
         }
-- 
2.1.0



More information about the ffmpeg-devel mailing list