Derek Buitenhuis
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f69f7a8bf
							
						
					 | 
					
						
						
							
							Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
						
						
						
						
						
						
						
						* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
						
						
					 | 
					
						2016-04-10 20:59:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
						
						
							
						
						
							650fd9c004
							
						
					 | 
					
						
						
							
							avformat/avr: check channels and bps in probe
						
						
						
						
						
						
						
						Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-11-11 14:51:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd54f70072
							
						
					 | 
					
						
						
							
							avformat/avr: use ff_get_pcm_codec_id()
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2013-10-12 20:21:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
						
						
							
						
						
							097f668047
							
						
					 | 
					
						
						
							
							avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
						
						
						
						
						
						
						
						Demuxers where the changed code looked less readable where skiped
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-05-05 13:34:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9b424879f
							
						
					 | 
					
						
						
							
							lavc & lavf: replace deprecated av_log* functions
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2013-03-15 18:10:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							15ab0393fd
							
						
					 | 
					
						
						
							
							avr: use ff_pcm_read_packet()
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-12-05 12:40:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							23101ceaa2
							
						
					 | 
					
						
						
							
							avrdec: implement seeking
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-11-28 13:03:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0d9b011c7
							
						
					 | 
					
						
						
							
							avrdec: sample rate takes 3 bytes not 4
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-11-28 11:02:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							1793128cf7
							
						
					 | 
					
						
						
							
							avrdec: fix typo in .long_name
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-11-28 10:56:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							70727e8774
							
						
					 | 
					
						
						
							
							lavf/avr: make .long_name consistent with others
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-11-05 20:47:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
						
						
							
						
						
							962314fe27
							
						
					 | 
					
						
						
							
							AVR demuxer
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-11-05 17:31:22 +00:00 | 
					
					
						
						
							
							
							
						
					 |