mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	source-output: Do not use unset channel map in pa_source_output_new
This problem was found when tracing down a crash coming from the
esound protocol, which does not set a channel map.
BugLink: http://bugs.launchpad.net/bugs/864071
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
N.B.: As Colin notes, this is because commit 117c7145 was incomplete
("format: Fix channel map handling")
			
			
This commit is contained in:
		
							parent
							
								
									58585db808
								
							
						
					
					
						commit
						60811ec15d
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -243,7 +243,8 @@ int pa_source_output_new(
 | 
			
		|||
         * to using the sample spec and channel map after all decisions w.r.t.
 | 
			
		||||
         * routing are complete. */
 | 
			
		||||
        pa_idxset *tmp = pa_idxset_new(NULL, NULL);
 | 
			
		||||
        pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec, &data->channel_map);
 | 
			
		||||
        pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec,
 | 
			
		||||
                data->channel_map_is_set ? &data->channel_map : NULL);
 | 
			
		||||
        pa_idxset_put(tmp, f, NULL);
 | 
			
		||||
        pa_source_output_new_data_set_formats(data, tmp);
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue