summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-07-22 01:24:22 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-07-22 01:24:22 (GMT)
commit7ac12599fe3a26176eb06a844e1255fcc6e4989b (patch)
treea9479f31b92c00f9bb209482864b761dccea42aa
parente2b718464e92fcde3d21c6653c88ddec2ab21c3f (diff)
downloadffmpeg-7ac12599fe3a26176eb06a844e1255fcc6e4989b.zip
ffmpeg-7ac12599fe3a26176eb06a844e1255fcc6e4989b.tar.gz
ffmpeg-7ac12599fe3a26176eb06a844e1255fcc6e4989b.tar.bz2
swresample: fix negative rematrix volumns
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libswresample/rematrix.c2
1 files changed, 1 insertions, 1 deletions
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++){