Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						89c3f5a907
					 | 
					
						
						
							
							avformat/takdec: use init_get_bits8()
						
						
						
						
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-08-05 10:14:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						4977e467a5
					 | 
					
						
						
							
							lavf/takdec: check metadata blocks checksum
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2013-07-10 12:07:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						f083b4c338
					 | 
					
						
						
							
							Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
						
						
						
						
						
						
						
						* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
  avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
	libavformat/ac3dec.c
	libavformat/avformat.h
	libavformat/avs.c
	libavformat/m4vdec.c
	libavformat/mov.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegvideodec.c
	libavformat/psxstr.c
	libavformat/pva.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-05-05 12:31:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Diego Biurrun
							
						 
					 | 
					
						
						
							
						
						e0f8be6413
					 | 
					
						
						
							
							avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
						
						
						
						
						
						
					 | 
					
						2013-05-04 21:43:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						cef28b5602
					 | 
					
						
						
							
							tak: reduce difference with qatar
						
						
						
						
						
						
						
						Mostly cosmetics changes, but also makes
decoding little faster here.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-12-09 22:01:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						7efee140d7
					 | 
					
						
						
							
							get_bits: rename get_bits_longlong to get_bits64
						
						
						
						
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2012-12-08 14:53:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						57231e4d5b
					 | 
					
						
						
							
							tak: demuxer, parser, and decoder
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> 
						
						
					 | 
					
						2012-12-07 16:15:02 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						03cc52a07d
					 | 
					
						
						
							
							takdec: fix seeking
						
						
						
						
						
						
						
						The previous approach was just wrong.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-10-10 13:09:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						1470c8a9a3
					 | 
					
						
						
							
							takdec: remove redundant/wrong avio_tell()
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-10-10 11:25:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						d7a4739265
					 | 
					
						
						
							
							TAK demuxer, decoder and parser
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-10-08 09:06:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |