Timo Rothenpieler
							
						 
						
							
							
							
								
							
								901b0f1a21 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: Use correct stream count on close  
							
							 
							
							
								
							
							
						 
						9 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								689211d572 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: set safe mode to enabled instead of auto  
							
							 
							
							 
							
							
								
							
							
							This is safer, as a selected demuxer could still mean that it was auto-detected
by a user application
Reviewed-previously-by: Nicolas George <george@nsup.org>
Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
							
						 
						9 years ago  
					 
				
					
						
							
							
								   Derek Buitenhuis
							
						 
						
							
							
							
								
							
								93629735d7 
								
							
								 
							
						 
						
							
							
								
								avformat: Add a protocol blacklisting API  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
							
						 
						9 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								fdb2d4b108 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: do not access packet if av_read_frame returned error  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Clément Bœsch
							
						 
						
							
							
							
								
							
								43ecec0f03 
								
							
								 
							
						 
						
							
							
								
								avformat: use AV_OPT_TYPE_BOOL in a bunch of places  
							
							 
							
							
								
							
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								65406b0bed 
								
							
								 
							
						 
						
							
							
								
								concatdec: add option for adding segment start time and duration metadata  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								ba9191ab3a 
								
							
								 
							
						 
						
							
							
								
								concatdec: simplify duration calculation in open_next_file  
							
							 
							
							 
							
							
								
							
							
							If duration is still AV_NOPTS_VALUE when opening the next file, we can assume
that outpoint is not set.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								8f60663c8b 
								
							
								 
							
						 
						
							
							
								
								concatdec: calculate duration early if outpoint is known  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Hendrik Leppkes
							
						 
						
							
							
							
								
							
								c2f861ca42 
								
							
								 
							
						 
						
							
							
								
								Replace remaining occurances of av_free_packet with av_packet_unref  
							
							 
							
							
								
							
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								df239b7619 
								
							
								 
							
						 
						
							
							
								
								concatdec: fix file_start_time calculation regression  
							
							 
							
							 
							
							
								
							
							
							Fixes ticket #4924 .
Found-by: Jaroslav Šnajdr <jsnajdr@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								80b6cc4214 
								
							
								 
							
						 
						
							
							
								
								concatdec: fix metadata memleak on error  
							
							 
							
							 
							
							
								
							
							
							Fixes Coverity CID 1323077.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								9f6ca28e32 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: Check file variable before dereferencing  
							
							 
							
							 
							
							
								
							
							
							Fixes CID1322328
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								0860016529 
								
							
								 
							
						 
						
							
							
								
								concatdec: fix broken file_inpoint calculation  
							
							 
							
							 
							
							
								
							
							
							Should fix ticket #4765 .
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								5117b5e9aa 
								
							
								 
							
						 
						
							
							
								
								concatdec: add support for injecting packet metadata  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								25a6711c25 
								
							
								 
							
						 
						
							
							
								
								concatdec: add support for specifying outpoint of files  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								12d82004c5 
								
							
								 
							
						 
						
							
							
								
								concatdec: store eof condition in context  
							
							 
							
							 
							
							
								
							
							
							This is needed later for outpoint support which may leave the last file in a
not-eof state.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Marton Balint
							
						 
						
							
							
							
								
							
								7ff0137a1f 
								
							
								 
							
						 
						
							
							
								
								concatdec: add support for specifying inpoint of files  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Vadim Belov
							
						 
						
							
							
							
								
							
								db64af6395 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: copy stream metadata when using concat  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								3331213e2a 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: Enable auto_convert by default  
							
							 
							
							 
							
							
								
							
							
							Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Zhang Rui
							
						 
						
							
							
							
								
							
								038f3a173f 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: avoid NULL dereference when failed to open file.  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								acbc2ed26a 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: handle NOPTS start_time.  
							
							 
							
							 
							
							
								
							
							
							Fix trac ticket #3598 .
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Stefano Sabatini
							
						 
						
							
							
							
								
							
								484d42a097 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: add timestamp log  
							
							 
							
							 
							
							
								
							
							
							Help debugging timestamp conversion issues. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								4641ae352e 
								
							
								 
							
						 
						
							
							
								
								avformat: Add and use ff_copy_whitelists()  
							
							 
							
							 
							
							
								
							
							
							Fixes potential security issue in case of running out of memory
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								5ea0753a15 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: Forward whitelists to the subdemuxers.  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								3294fc8c47 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								50ed6e3ce6 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: implement automatic conversions.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								9d24a536a3 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: reindent after last commit.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								b24d6c5303 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: always do stream matching.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								c27939d871 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: check match_streams() return value.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								e973cf04f6 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: use a structure for each stream.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								26dea7731e 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: allow to match streams by id.  
							
							 
							
							 
							
							
								
							
							
							That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								6bffa83bbe 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: reindent after last commit.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								8a670f52a5 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: more reliable test for absolute URLs.  
							
							 
							
							 
							
							
								
							
							
							ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Zhang Rui
							
						 
						
							
							
							
								
							
								4958628ba6 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: pass the interrupt callback on  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Stefano Sabatini
							
						 
						
							
							
							
								
							
								aeccb522eb 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: fix crash in case a file in script cannot be opened  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								ca2f6b6932 
								
							
								 
							
						 
						
							
							
								
								lavf/concat: reject empty scripts.  
							
							 
							
							 
							
							
								
							
							
							Fix trac ticket #2566 . 
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								d608a27d9e 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								de1a71595d 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: support seeking.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								de1568a452 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: fix possible leak in case of malloc failure.  
							
							 
							
							 
							
							
								
							
							
							Fix CID 747737. 
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								c31458c334 
								
							
								 
							
						 
						
							
							
								
								lavf/concat: compute duration if possible.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								3ab25e4574 
								
							
								 
							
						 
						
							
							
								
								Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"  
							
							 
							
							 
							
							
								
							
							
							This reverts commit 6cc12353a8 .
Conflicts:
	libavformat/version.h
Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it. 
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Stefano Sabatini
							
						 
						
							
							
							
								
							
								6cc12353a8 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: define "ffcat" and "ffconcat" extensions  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								ea2de3d096 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: add the "duration" directive.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								b68dd8a161 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: allow probing.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								db9dc5154d 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: add signature directive.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								6d680d20ad 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: add safe option.  
							
							 
							
							
								
							
							
						 
						12 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								8976ef7aec 
								
							
								 
							
						 
						
							
							
								
								concatdec: change data type to suppress warning about limited range of data type on some platforms.  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						13 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								16c3cb9bbf 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: avoid leaking URLs.  
							
							 
							
							 
							
							
								
							
							
							Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label. 
							
						 
						13 years ago  
					 
				
					
						
							
							
								   Nicolas George
							
						 
						
							
							
							
								
							
								32aedebdc5 
								
							
								 
							
						 
						
							
							
								
								lavf: add a concat demuxer.  
							
							 
							
							
								
							
							
						 
						13 years ago