ffabff1baa 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: add support for very long line sizes  
							
							Fixes ticket #6761 .
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								18ac642359 
								
							
								 
							
						 
						
							
							
								
								avformat: migrate to AVFormatContext->url  
							
							Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e45f7bca73 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: properly init streams timestamp parameters.  
							
							pts_wrap_bits defaults to 33 (like MPEG), that causes valid
timestamps to be unwrapped and become invalid.
Inspired by a patch by Wu Zhiqiang <mymoeyard@gmail.com>. 
							
						 
						7 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1a0d9b503d 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: add fallback for calculating file duration  
							
							If a file does not have a known duration, this leads to the timestamps
starting over for the next file, causing non-monotonic timestamps.
To prevent this, track the duration during demuxing and use it to
determine the current file duration before opening the next file.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
							
						 
						8 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								99c68861f9 
								
							
								 
							
						 
						
							
							
								
								concatdec: Do not pass NULL to memcmp  
							
							Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
							
						 
						8 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0dcac9c3f0 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: do not transfer custom IO flag  
							
							If the source is using a custom IO, setting this flag causes heavy leaks
since the segments will not have their avio context closed.
Regression since f5da453b06 
							
						 
						8 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								14e092448f 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: port to the new bitstream filter API  
							
							Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com> 
							
						 
						8 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b4330a0e02 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: fix the h264 annexb extradata check  
							
							The start code can be either in the first three or four bytes. 
							
						 
						8 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f5da453b06 
								
							
								 
							
						 
						
							
							
								
								concatdec: pass AVFormatContext flags to sub demuxer  
							
							
								
							
							
						 
						8 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2366efce3c 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: don't call open_file when seek position within a file  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								0cb19c30c6 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.  
							
							Fix remuxing H.264-in-MP4 to Matroska, possibly others. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b8fa374fb6 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: remove unrelated change during codecpar merge.  
							
							Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461 . 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								901b0f1a21 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: Use correct stream count on close  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								93629735d7 
								
							
								 
							
						 
						
							
							
								
								avformat: Add a protocol blacklisting API  
							
							Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								43ecec0f03 
								
							
								 
							
						 
						
							
							
								
								avformat: use AV_OPT_TYPE_BOOL in a bunch of places  
							
							
								
							
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								c2f861ca42 
								
							
								 
							
						 
						
							
							
								
								Replace remaining occurances of av_free_packet with av_packet_unref  
							
							
								
							
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								0860016529 
								
							
								 
							
						 
						
							
							
								
								concatdec: fix broken file_inpoint calculation  
							
							Should fix ticket #4765 .
Signed-off-by: Marton Balint <cus@passwd.hu> 
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								484d42a097 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: add timestamp log  
							
							Help debugging timestamp conversion issues. 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								5ea0753a15 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: Forward whitelists to the subdemuxers.  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								50ed6e3ce6 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: implement automatic conversions.  
							
							
								
							
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9d24a536a3 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: reindent after last commit.  
							
							
								
							
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b24d6c5303 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: always do stream matching.  
							
							
								
							
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c27939d871 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: check match_streams() return value.  
							
							
								
							
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e973cf04f6 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: use a structure for each stream.  
							
							
								
							
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								6bffa83bbe 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: reindent after last commit.  
							
							
								
							
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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  
				
					
						
							
							
								 
						
							
							
							
								
							
								4958628ba6 
								
							
								 
							
						 
						
							
							
								
								avformat/concatdec: pass the interrupt callback on  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								aeccb522eb 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: fix crash in case a file in script cannot be opened  
							
							
								
							
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ca2f6b6932 
								
							
								 
							
						 
						
							
							
								
								lavf/concat: reject empty scripts.  
							
							Fix trac ticket #2566 . 
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d608a27d9e 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.  
							
							
								
							
							
						 
						12 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								de1a71595d 
								
							
								 
							
						 
						
							
							
								
								lavf/concatdec: support seeking.  
							
							
								
							
							
						 
						12 years ago