[FFmpeg-cvslog] swresample: fix negative rematrix volumns

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 22 03:24:22 2013 +0200| [7ac12599fe3a26176eb06a844e1255fcc6e4989b] | committer: Michael Niedermayer

swresample: fix negative rematrix volumns

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswresample/rematrix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 33e2966..f13c240 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -313,7 +313,7 @@ av_cold static int auto_matrix(SwrContext *s)
     } else
         maxval = INT_MAX;
 
-    if(maxcoef > maxval){
+    if(maxcoef > maxval || s->rematrix_volume  < 0){
         maxcoef /= maxval;
         for(i=0; i<SWR_CH_MAX; i++)
             for(j=0; j<SWR_CH_MAX; j++){