diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-12-11 15:56:17 -0500 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-12-12 09:09:00 +0100 |
| commit | 42b5688d5ed340c9298650a7b8e88bb8b2c56c8c (patch) | |
| tree | 47735ac6392d4c007baa9bd1e25d86b9f0ec59e7 /libavresample/utils.c | |
| parent | 6f40e9f070f7a6ccf745561409ddbcc2be5e47e5 (diff) | |
| download | ffmpeg-42b5688d5ed340c9298650a7b8e88bb8b2c56c8c.tar.gz | |
lavr: fix segfault due to overlooked change needed in 14758e3
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavresample/utils.c')
| -rw-r--r-- | libavresample/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c index 8245e6a345..fe2e1c266b 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; |