Michael Niedermayer
							
						 
					 | 
					
						
						
						
						
							
						
						
							482c1ac849
							
						
					 | 
					
						
						
							
							Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
						
						
						
						
						
						
						
						* commit '13f57a4d881ec669b87bf82f424bfff502433060':
  wav: K&R formatting cosmetics
Conflicts:
	libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-05-03 11:06:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							3174137d41
							
						
					 | 
					
						
						
							
							w64: fact guid support
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2013-01-07 10:08:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							14d50c19dc
							
						
					 | 
					
						
						
							
							w64dec: support metadata (summarylist guid)
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2013-01-05 11:03:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a74282644
							
						
					 | 
					
						
						
							
							Sony Wave64 muxer
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-12-31 07:10:57 +00:00 | 
					
					
						
						
							
							
							
						
					 |