Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						0d3821a6df
					 | 
					
						
						
							
							Merge commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930'
						
						
						
						
						
						
						
						* commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930':
  hq_hqa: Fix table data for profile 17
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2015-04-24 21:27:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vittorio Giovara
							
						 
					 | 
					
						
						
							
						
						a4edaeb50f
					 | 
					
						
						
							
							hq_hqa: Fix table data for profile 17
						
						
						
						
						
						
						
						The table had a wrong table height and was missing the first line of bytes.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 | 
					
						2015-04-24 14:55:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						5a284d076f
					 | 
					
						
						
							
							Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
						
						
						
						
						
						
						
						* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder
Conflicts:
	Changelog
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2015-04-20 05:28:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vittorio Giovara
							
						 
					 | 
					
						
						
							
						
						22526c1f55
					 | 
					
						
						
							
							Canopus HQ/HQA decoder
						
						
						
						
						
						
						
						Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 | 
					
						2015-04-19 22:37:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |