Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'
* commit 'f0e959481968b6d906931127237ed981b6414f6e': af_channelmap: Set the frame channel layout Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		
						commit
						e85bc9df87
					
				@ -338,6 +338,8 @@ static int channelmap_filter_frame(AVFilterLink *inlink, AVFrame *buf)
 | 
			
		||||
        memcpy(buf->data, buf->extended_data,
 | 
			
		||||
           FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0]));
 | 
			
		||||
 | 
			
		||||
    buf->channel_layout = outlink->channel_layout;
 | 
			
		||||
 | 
			
		||||
    return ff_filter_frame(outlink, buf);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user