[FFmpeg-cvslog] lavr: fix segfault due to overlooked change needed in 14758e3
Justin Ruggles
git at videolan.org
Wed Dec 12 11:07:32 CET 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Tue Dec 11 15:56:17 2012 -0500| [42b5688d5ed340c9298650a7b8e88bb8b2c56c8c] | committer: Luca Barbato
lavr: fix segfault due to overlooked change needed in 14758e3
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42b5688d5ed340c9298650a7b8e88bb8b2c56c8c
---
libavresample/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavresample/utils.c b/libavresample/utils.c
index 8245e6a..fe2e1c2 100644
--- a/libavresample/utils.c
+++ b/libavresample/utils.c
@@ -49,7 +49,7 @@ int avresample_open(AVAudioResampleContext *avr)
avr->resample_channels = FFMIN(avr->in_channels, avr->out_channels);
avr->downmix_needed = avr->in_channels > avr->out_channels;
avr->upmix_needed = avr->out_channels > avr->in_channels ||
- (!avr->downmix_needed && (avr->am->matrix ||
+ (!avr->downmix_needed && (avr->mix_matrix ||
avr->in_channel_layout != avr->out_channel_layout));
avr->mixing_needed = avr->downmix_needed || avr->upmix_needed;
More information about the ffmpeg-cvslog
mailing list