Derek Buitenhuis 
							
						 
					 
					
						
						
							
						
						f8e89d8a29 
					 
					
						
						
							
							Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'  
						
						... 
						
						
						
						* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
  avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com > 
						
						
					 
					
						2016-04-21 15:55:09 +01:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
							
						
						93629735d7 
					 
					
						
						
							
							avformat: Add a protocol blacklisting API  
						
						... 
						
						
						
						Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com > 
						
						
					 
					
						2016-03-04 16:13:42 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
							
						
						9c75148e6e 
					 
					
						
						
							
							Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'  
						
						... 
						
						
						
						This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
  lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com > 
						
						
					 
					
						2016-02-29 16:51:10 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						fe3fed0b14 
					 
					
						
						
							
							Update demuxers and protocols for protocol whitelist support  
						
						... 
						
						
						
						Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc > 
						
						
					 
					
						2016-02-02 04:16:50 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
							
						
						97e87e09c8 
					 
					
						
						
							
							lavf: add subfile protocol.  
						
						
						
						
					 
					
						2014-03-08 12:36:57 +01:00