avfilter/af_channelmap: do not override set channel layout
This commit is contained in:
		
							parent
							
								
									bbdedd9663
								
							
						
					
					
						commit
						37c5bcc4e8
					
				| @ -230,7 +230,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx) | |||||||
|     s->nch           = map_entries; |     s->nch           = map_entries; | ||||||
|     if (out_ch_mask) |     if (out_ch_mask) | ||||||
|         av_channel_layout_from_mask(&s->output_layout, out_ch_mask); |         av_channel_layout_from_mask(&s->output_layout, out_ch_mask); | ||||||
|     else if (map_entries) |     else if (map_entries && s->output_layout.nb_channels == 0) | ||||||
|         av_channel_layout_default(&s->output_layout, map_entries); |         av_channel_layout_default(&s->output_layout, map_entries); | ||||||
| 
 | 
 | ||||||
|     if (mode == MAP_NONE) { |     if (mode == MAP_NONE) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user