Prevent a common segfault.
---

Not sure it is the proper fix, but at least unbreaks fate.

 libavresample/utils.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavresample/utils.c b/libavresample/utils.c
index 8245e6a..94c87d7 100644
--- a/libavresample/utils.c
+++ b/libavresample/utils.c
@@ -49,8 +49,10 @@ 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->in_channel_layout != 
avr->out_channel_layout));
+                             (!avr->downmix_needed &&
+                              ((avr->am && avr->am->matrix) ||
+                               avr->in_channel_layout !=
+                               avr->out_channel_layout));
     avr->mixing_needed     = avr->downmix_needed || avr->upmix_needed;

     /* set resampling parameters */
--
1.7.12

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to