lavr: call mix_function_init() in ff_audio_mix_set_matrix()
This is needed if a custom matrix is set by the user after opening the AVAudioResampleContext because the matrix channel count can change if different mixing coefficients are used. CC:libav-stable@libav.org
This commit is contained in:
		
							parent
							
								
									56ef1ef1f7
								
							
						
					
					
						commit
						f07ef2d9c9
					
				@ -422,10 +422,6 @@ AudioMix *ff_audio_mix_alloc(AVAudioResampleContext *avr)
 | 
				
			|||||||
        av_free(matrix_dbl);
 | 
					        av_free(matrix_dbl);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ret = mix_function_init(am);
 | 
					 | 
				
			||||||
    if (ret < 0)
 | 
					 | 
				
			||||||
        goto error;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    return am;
 | 
					    return am;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
error:
 | 
					error:
 | 
				
			||||||
@ -704,5 +700,5 @@ int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
 | 
				
			|||||||
        return AVERROR(EINVAL);
 | 
					        return AVERROR(EINVAL);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return 0;
 | 
					    return mix_function_init(am);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user