Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						66de11b064
					 | 
					
						
						
							
							Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'
						
						
						
						
						
						
						
						* commit '7c60c124c8dfaebfafa2b3c11b316db549617732':
  hqx: Drop unused offsets table
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2015-03-17 21:18:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vittorio Giovara
							
						 
					 | 
					
						
						
							
						
						7c60c124c8
					 | 
					
						
						
							
							hqx: Drop unused offsets table
						
						
						
						
						
						
						
						This is a leftover from the static to dynamic vlc table conversion. 
						
						
					 | 
					
						2015-03-17 13:34:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						2cf521718d
					 | 
					
						
						
							
							Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
						
						
						
						
						
						
						
						* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder
Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2015-02-23 12:19:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vittorio Giovara
							
						 
					 | 
					
						
						
							
						
						35c6ce76b1
					 | 
					
						
						
							
							Canopus HQX decoder
						
						
						
						
						
						
						
						Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>. 
						
						
					 | 
					
						2015-02-22 22:42:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |