James Almer
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdd03d2d79
							
						
					 | 
					
						
						
							
							Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
						
						
						
						
						
						
						
						* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h
Merged-by: James Almer <jamrial@gmail.com> 
						
						
					 | 
					
						2017-11-11 16:19:50 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Diego Biurrun
							
						 
					 | 
					
						
						
						
						
							
						
						
							b586903ae1
							
						
					 | 
					
						
						
							
							build: Drop redundant check for soundcard.h
						
						
						
						
						
						
						
						It should be sys/soundcard.h nowadays. 
						
						
					 | 
					
						2017-10-10 23:20:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1b58310d0
							
						
					 | 
					
						
						
							
							Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
						
						
						
						
						
						
						
						* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme
Conflicts:
	libavdevice/Makefile
	libavdevice/alsa.h
	libavdevice/alsa_dec.c
	libavdevice/alsa_enc.c
	libavdevice/sndio_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2015-04-09 21:36:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Diego Biurrun
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d26c193fb
							
						
					 | 
					
						
						
							
							avdevice: Apply a more consistent file naming scheme
						
						
						
						
						
						
					 | 
					
						2015-04-09 16:40:12 +02:00 | 
					
					
						
						
							
							
							
						
					 |