Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						19321a295a 
					 
					
						
						
							
							avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings during parsing  
						
						... 
						
						
						
						Fixes: AVCI100_Test.mxf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-24 18:20:40 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						50255b7a86 
					 
					
						
						
							
							Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'  
						
						... 
						
						
						
						* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
  cmdutils: Add a stream specifier to map usable streams
Conflicts:
	cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-20 20:15:40 +01:00 
						 
				 
			
				
					
						
							
							
								wm4 
							
						 
					 
					
						
						
							
						
						cca44764b9 
					 
					
						
						
							
							avformat: add avformat_flush()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-05 00:09:26 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2924514721 
					 
					
						
						
							
							Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'  
						
						... 
						
						
						
						* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
  lavf: move internal fields from public to internal context
Conflicts:
	libavformat/avformat.h
	libavformat/internal.h
	libavformat/mux.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-02-11 02:47:54 +01:00 
						 
				 
			
				
					
						
							
							
								wm4 
							
						 
					 
					
						
						
							
						
						9deaec7828 
					 
					
						
						
							
							lavf: move internal fields from public to internal context  
						
						... 
						
						
						
						This is not an API change; the fields were explicitly declared private
before.
Signed-off-by: Anton Khirnov <anton@khirnov.net > 
						
						
					 
					
						2015-02-10 21:45:04 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						e8f814a907 
					 
					
						
						
							
							avformat/utils: Fix division by 0  
						
						... 
						
						
						
						Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-02-09 21:15:27 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						fd242b468d 
					 
					
						
						
							
							lavf/utils: fix if_( style  
						
						
						
						
					 
					
						2015-02-04 13:17:30 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						e005dc621a 
					 
					
						
						
							
							avformat: fix mode of img2dec.c and utils.c  
						
						... 
						
						
						
						Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-02-03 22:27:23 +01:00 
						 
				 
			
				
					
						
							
							
								Liviu Oniciuc 
							
						 
					 
					
						
						
							
						
						b37858eae1 
					 
					
						
						
							
							avformat/img2dec: remove the non-negative number requirement for start_number option  
						
						... 
						
						
						
						industrial cameras usually mark the trigger frame as frame number 0
all frames saved before trigger frame receive a negative sequence number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-02-03 18:57:23 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7620d48f2e 
					 
					
						
						
							
							avformat/network: Check for av_malloc* failures in ff_tls_init()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-02-03 02:21:55 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						4b15bba2ae 
					 
					
						
						
							
							avformat/utils: Fix number suffixes in tb_unreliable()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-02-01 19:19:25 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						43630c82f1 
					 
					
						
						
							
							avformat/utils: remove unneeded #include, there are no assert() only av_assert*  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2015-01-31 08:57:06 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0bdcc27d95 
					 
					
						
						
							
							Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'  
						
						... 
						
						
						
						* commit '4227e4fe7443733fb906f6fb6c265105e8269c74':
  lavf: add a convenience function for adding side data to a stream
Conflicts:
	libavformat/internal.h
	libavformat/replaygain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-01-27 18:16:42 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						4227e4fe74 
					 
					
						
						
							
							lavf: add a convenience function for adding side data to a stream  
						
						
						
						
					 
					
						2015-01-27 09:18:32 +01:00 
						 
				 
			
				
					
						
							
							
								Anshul Maheshwari 
							
						 
					 
					
						
						
							
						
						a47c9331ef 
					 
					
						
						
							
							avformat: Improve data streams/codec support  
						
						... 
						
						
						
						This adds data codec/stream handling where previously there was only
audio/video/subtitles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-01-16 02:24:08 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2959a61232 
					 
					
						
						
							
							avformat/utils: Use avio_closep() to avoid leaving stale pointers in memory  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-01-09 13:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						bbfca8e84b 
					 
					
						
						
							
							avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-01-06 15:07:50 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ce1e10aa24 
					 
					
						
						
							
							avformat/utils: add dvbsub to set_codec_from_probe_data()  
						
						... 
						
						
						
						Fixes part of ticket 4221
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-01-05 01:45:49 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
							
						
						9f810a9b37 
					 
					
						
						
							
							libavformat: Check for malloc failures in avformat_new_stream  
						
						... 
						
						
						
						CC: libav-stable@libav.org 
Signed-off-by: Martin Storsjö <martin@martin.st > 
						
						
					 
					
						2015-01-04 20:04:36 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						649c158e8c 
					 
					
						
						
							
							Add FFMPEG_VERSION into the binary libs  
						
						... 
						
						
						
						This simplifies identifying from which revision a binary of a lib came from
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-19 19:32:40 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a29524bf2e 
					 
					
						
						
							
							avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()  
						
						... 
						
						
						
						Fixes Ticket3686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-14 20:56:59 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						add46edf33 
					 
					
						
						
							
							avformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration()  
						
						... 
						
						
						
						This is primarly to maintain current behavior when r_frame_rate is set for muxers
and could be reverted if it has some advantage
Fixes Ticket3629 part1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-14 02:12:49 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d5a263f480 
					 
					
						
						
							
							fix "than" typo  
						
						... 
						
						
						
						Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-13 20:52:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						53496aa7f3 
					 
					
						
						
							
							avformat/utils: Do not estimate the container bitrate from the streams if one video stream lacks the bitrate  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-13 19:20:10 +01:00 
						 
				 
			
				
					
						
							
							
								wm4 
							
						 
					 
					
						
						
							
						
						a66893ac94 
					 
					
						
						
							
							avformat/utils: check for malloc failure  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-12 23:37:29 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						20cb3fab3f 
					 
					
						
						
							
							avformat/utils: change assert to av_assert0()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-09 17:57:35 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						041c6109da 
					 
					
						
						
							
							avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-09 17:53:30 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a5e5959d52 
					 
					
						
						
							
							avformat/utils: fix calculating the absolute difference of timestamps  
						
						... 
						
						
						
						we dont use FFABS(a-b) as that could result in undefined behavior if it overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-09 06:13:32 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						dd70470d72 
					 
					
						
						
							
							avformat/utils: Compute the current pts of mpeg1/2 I/P frames from the next frame when available  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-09 03:34:20 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9e561410c0 
					 
					
						
						
							
							avformat/utils: Pass the next pts/dts to compute_pkt_fields() when available  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-09 03:33:44 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						24fdf7334d 
					 
					
						
						
							
							avformat/utils: Search harder for missing stream information in flv by default  
						
						... 
						
						
						
						Fixes Ticket4133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-12-01 15:49:32 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						367c9d33d6 
					 
					
						
						
							
							avformat: replace some odd 30-60 rates by higher less odd ones in  get_std_framerate()  
						
						... 
						
						
						
						Fixes Ticket4012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-11-21 13:56:13 +01:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
							
						
						92c07acce7 
					 
					
						
						
							
							Read (display) aspect ratio from mxf files.  
						
						... 
						
						
						
						Fixes ticket #4107 . 
						
						
					 
					
						2014-11-17 17:54:32 +01:00 
						 
				 
			
				
					
						
							
							
								Lukasz Marek 
							
						 
					 
					
						
						
							
						
						6690d4c3f5 
					 
					
						
						
							
							lavf/ffm: store/restore private codec context  
						
						... 
						
						
						
						Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com > 
						
						
					 
					
						2014-11-16 01:13:38 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a7f25979dd 
					 
					
						
						
							
							avformat/utils: Leave skip_clear enabled until after estimate_timings()  
						
						... 
						
						
						
						Should make no difference but will be needed for subsequent commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-11-03 22:53:48 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Mundt 
							
						 
					 
					
						
						
							
						
						1700fa013e 
					 
					
						
						
							
							avformat/utils: support more AVC Intra formats without SPS/PPS header  
						
						... 
						
						
						
						add support for AVC Intra 50 720p and 1080p without SPS/PPS header in mxf and mov demuxers. I got the SPS/PPS tables from libbmx.
Reviewed-by: tomas.hardin@codemill.se 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-29 20:08:32 +01:00 
						 
				 
			
				
					
						
							
							
								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 > 
						
						
					 
					
						2014-10-24 19:23:23 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						057ea2a982 
					 
					
						
						
							
							avformat: Add format_whitelist  
						
						... 
						
						
						
						This allows restricting demuxers to a list of needed ones for improved security
Note, some demuxers themselfs open other demuxers, these are only restricted if
AVOptions are forwarded to them. Please check that your code does that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-19 04:37:30 +02:00 
						 
				 
			
				
					
						
							
							
								Luca Barbato 
							
						 
					 
					
						
						
							
						
						0db6bbb24c 
					 
					
						
						
							
							avformat: Make avformat_free_context handle NULL  
						
						... 
						
						
						
						Work as the other free()-like functions.
Bug-Id: CID 1087081
CC: libav-stable@libav.org  
						
						
					 
					
						2014-10-17 09:55:46 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d267a0f8c1 
					 
					
						
						
							
							avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-16 02:46:11 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						004f1c6cf1 
					 
					
						
						
							
							avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case  
						
						... 
						
						
						
						No testcase where this makes a difference is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-16 02:46:02 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a92192d2e4 
					 
					
						
						
							
							avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-15 18:23:21 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2b37864e7f 
					 
					
						
						
							
							Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'  
						
						... 
						
						
						
						* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
  lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-15 18:19:58 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						2d6e58497e 
					 
					
						
						
							
							lavf: switch to AVCodecContext.framerate for demuxing  
						
						
						
						
					 
					
						2014-10-15 06:37:55 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						40f2b16d52 
					 
					
						
						
							
							avformat/utils: print more information with av_dlog() in compute_pkt_fields()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-10-13 23:45:52 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						bd239c9a2e 
					 
					
						
						
							
							lavf: Don't drop both pts and dts if timestamps are invalid  
						
						... 
						
						
						
						In these cases, only drop dts. Because if we drop both we have no
timestamps at all for some files.
This improves playback of HLS streams from GoPro cameras.
Signed-off-by: Martin Storsjö <martin@martin.st > 
						
						
					 
					
						2014-10-12 01:32:52 +03:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						ddc3768161 
					 
					
						
						
							
							avformat: remove obsolete FF_API_READ_PACKET cruft  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com > 
						
						
					 
					
						2014-10-05 17:10:26 -03:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						ecf457f3ac 
					 
					
						
						
							
							avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruft  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com > 
						
						
					 
					
						2014-10-05 17:10:23 -03:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						3bd9f17b8a 
					 
					
						
						
							
							avformat: remove obsolete FF_API_SET_PTS_INFO cruft  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com > 
						
						
					 
					
						2014-10-05 17:10:20 -03:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						a578b93c73 
					 
					
						
						
							
							avformat: remove obsolete FF_API_NEW_STREAM cruft  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com > 
						
						
					 
					
						2014-10-05 17:10:15 -03:00