summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-08 21:11:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-08 21:12:40 +0200
commitf8d74cbdc39726965723ff81ccb10a841d5ab8a4 (patch)
treeedb131ce9541fcd0a45876ccac0623e758866466 /libswresample
parentc8ffab06f4bc039f4ff191de4761ab3c57eb684a (diff)
downloadffmpeg-f8d74cbdc39726965723ff81ccb10a841d5ab8a4.tar.gz
swr/auto_matrix: treat stereo downmix like stereo.
Based on code by John Stebbins Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/rematrix.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index a8d5fde00c..c4c218de54 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -103,6 +103,8 @@ static int even(int64_t layout){
}
static int clean_layout(SwrContext *s, int64_t layout){
+ if((layout & AV_CH_LAYOUT_STEREO_DOWNMIX) == AV_CH_LAYOUT_STEREO_DOWNMIX)
+ return AV_CH_LAYOUT_STEREO;
return layout;
}