Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							9f3a555b84 
							
						 
					 
					
						
						
							
							Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'  
						
						... 
						
						
						
						* commit '03f2de5856ec8571fcf5f4cf6dccc713294af545':
  aviocat: Check the argv array length before reading element i+1
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-01-17 14:31:19 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							87acd33c09 
							
						 
					 
					
						
						
							
							aviocat: Add support for specifying the input duration  
						
						... 
						
						
						
						This avoids the caller having to calculate the byte rate if wanting
to push a file in a rate resembling realtime.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2014-01-17 09:32:09 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							03f2de5856 
							
						 
					 
					
						
						
							
							aviocat: Check the argv array length before reading element i+1  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2014-01-17 09:31:53 +02:00 
						 
				 
			
				
					
						
							
							
								Lou Logan 
							
						 
					 
					
						
						
						
						
							
						
						
							2574d62d0d 
							
						 
					 
					
						
						
							
							tools/qt-faststart: add -movflags +faststart note  
						
						
						
						
					 
					
						2014-01-07 10:59:04 -09:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							129ce05b02 
							
						 
					 
					
						
						
							
							tools/zmqsend: rename ctx to zmq_ctx  
						
						... 
						
						
						
						The new name is more explicit. 
						
						
					 
					
						2013-12-23 18:44:52 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							dd00f9cac3 
							
						 
					 
					
						
						
							
							tools/zmqsend: use valid NULL log context  
						
						... 
						
						
						
						The zmq context is not a valid log context. Fix crash. 
						
						
					 
					
						2013-12-23 18:44:52 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							37437d97a8 
							
						 
					 
					
						
						
							
							tools/probetest: Check av_realloc() return code  
						
						... 
						
						
						
						Fixess CID1135761
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-12-11 22:29:22 +01:00 
						 
				 
			
				
					
						
							
							
								Timothy Gu 
							
						 
					 
					
						
						
						
						
							
						
						
							d6c5fd9f15 
							
						 
					 
					
						
						
							
							tools/: Add gen-rc tool for generating Windows resource files  
						
						... 
						
						
						
						Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-12-11 19:27:35 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6b4f58d448 
							
						 
					 
					
						
						
							
							tools/probetest: also print the time the probe functions needed  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-08 22:33:52 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							32584667ea 
							
						 
					 
					
						
						
							
							tools/probetest: use named constant for the maximum number of formats  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-08 22:33:52 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							82c86d0b18 
							
						 
					 
					
						
						
							
							graph2dot: Add missing #include for av_get_channel_layout_string()  
						
						
						
						
					 
					
						2013-11-04 23:04:10 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							48715285f6 
							
						 
					 
					
						
						
							
							graph2dot: Fix use of deprecated API  
						
						
						
						
					 
					
						2013-11-04 23:04:10 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							922596e3da 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  ismindex: Change the duration field to int64_t
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-10-05 11:35:39 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							47a57c6832 
							
						 
					 
					
						
						
							
							Merge commit '583a287f6f48f263859df142e6f90993e4217c72'  
						
						... 
						
						
						
						* commit '583a287f6f48f263859df142e6f90993e4217c72':
  ismindex: Calculate the file duration among the included tracks
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-10-05 11:29:02 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							5de251a3e3 
							
						 
					 
					
						
						
							
							Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'  
						
						... 
						
						
						
						* commit 'd347a7b248d4ffdc278373fecf033b0ade030343':
  ismindex: Use the individual stream duration instead of the global one
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-10-05 11:14:26 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							a4435f9235 
							
						 
					 
					
						
						
							
							ismindex: Change the duration field to int64_t  
						
						... 
						
						
						
						This reduces the risk for overflow in pathlogical cases.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-10-05 00:01:28 +03:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							583a287f6f 
							
						 
					 
					
						
						
							
							ismindex: Calculate the file duration among the included tracks  
						
						... 
						
						
						
						If the input file contains other tracks (non video/audio) that
aren't included in ismindex, the global file duration as returned
by libavformat might not be equal to the maximum of the duration
of the actual included tracks.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-10-05 00:01:18 +03:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							d347a7b248 
							
						 
					 
					
						
						
							
							ismindex: Use the individual stream duration instead of the global one  
						
						... 
						
						
						
						The stream duration is used for calculating the duration of the
last fragment easily without manually parsing anything else than
the mfra/tfra atoms. When the global file duration was used
previously, the duration of the last fragment could end up wrong
if the streams weren't equally long.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-10-05 00:01:08 +03:00 
						 
				 
			
				
					
						
							
							
								Alex Smith 
							
						 
					 
					
						
						
						
						
							
						
						
							2599a62fbb 
							
						 
					 
					
						
						
							
							ffhash: Change size to an int  
						
						... 
						
						
						
						This fixes compilation with MSVC and ICL, and makes ffhash consistent
with how the rest of the codebase uses read().
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-09-24 16:29:18 +02:00 
						 
				 
			
				
					
						
							
							
								Alex Smith 
							
						 
					 
					
						
						
						
						
							
						
						
							eedbc2b56d 
							
						 
					 
					
						
						
							
							tools: Fix apparent merge failure  
						
						
						
						
					 
					
						2013-09-21 14:40:31 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc68927a0f 
							
						 
					 
					
						
						
							
							tools/crypto_bench: fix 2 typos.  
						
						
						
						
					 
					
						2013-09-04 21:59:34 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							d5b58f678d 
							
						 
					 
					
						
						
							
							tools: add benchmark for crypto functions.  
						
						... 
						
						
						
						The benchmark tests the speed of the following algorithms:
MD5, SHA-1, SHA-256, SHA-512, RIPEMD-160, AES-128.
It can optionally be built to perform the same benchmark on
other crypto libraries, for comparison purposes.
The supported libraries are:
- crypto:   OpenSSL's libcrypto;
- gcrypt:   GnuTLS's libgcrypt;
- tomcrypt: LibTomCrypt
To enable them, use this syntax:
make VERSUS=crypto+gcrypt+tomcrypt tools/crypto_bench
They do not need to have been enabled in configure. 
						
						
					 
					
						2013-09-04 16:36:11 +02:00 
						 
				 
			
				
					
						
							
							
								Thilo Borgmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d814a839ac 
							
						 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							59360cd456 
							
						 
					 
					
						
						
							
							tools/graph2dot: fix use of deprecated *put_count  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-08-25 19:37:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							1dfb34db6d 
							
						 
					 
					
						
						
							
							Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'  
						
						... 
						
						
						
						* commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc':
  ismindex: Replace mkdir ifdeffery by os_support.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-08-06 14:50:27 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							bea3d6f436 
							
						 
					 
					
						
						
							
							ismindex: Replace mkdir ifdeffery by os_support.h #include  
						
						... 
						
						
						
						os_support.h contains more precise workarounds for non-POSIX mkdir(). 
						
						
					 
					
						2013-08-05 11:38:00 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b7ce510003 
							
						 
					 
					
						
						
							
							Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'  
						
						... 
						
						
						
						* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
  avprobe: rename the prettyprint structures
  tools: Wording and formatting cosmetics
Conflicts:
	avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-07-07 11:35:59 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							cd7b6deeaa 
							
						 
					 
					
						
						
							
							tools: Wording and formatting cosmetics  
						
						
						
						
					 
					
						2013-07-06 15:36:57 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							582f36ca3f 
							
						 
					 
					
						
						
							
							tools/qt-faststart: Fix unintended sign extension of current_offset  
						
						... 
						
						
						
						Fixes: CID733809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-06-02 23:10:44 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							69ce34c796 
							
						 
					 
					
						
						
							
							tools/qt-faststart: Fix unintended sign extension of atom_size  
						
						... 
						
						
						
						Fixes CID733810
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-06-02 23:10:31 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c1075d6af7 
							
						 
					 
					
						
						
							
							tools/ffhash: close file handle on error  
						
						... 
						
						
						
						Fixes CID1026768
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-06-02 22:52:23 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							de488525e5 
							
						 
					 
					
						
						
							
							tools/ffeval: Check return value of av_expr_parse_and_eval()  
						
						... 
						
						
						
						Fixes CID1026745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-06-02 22:48:03 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0fb7fef879 
							
						 
					 
					
						
						
							
							tools/patcheck: fix misdetection with stuff like const_names  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-23 19:11:28 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56f7e29dba 
							
						 
					 
					
						
						
							
							tools: add zmqshell.py.  
						
						
						
						
					 
					
						2013-05-19 17:59:21 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							54372848f3 
							
						 
					 
					
						
						
							
							tools/ffhash: Use O_BINARY when available  
						
						... 
						
						
						
						This fixes reading files in Windows
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-17 00:38:07 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							b22f96b736 
							
						 
					 
					
						
						
							
							Rename ffadler to ffhash and expand it using the generic hash API  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-16 17:58:56 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c71f95f8 
							
						 
					 
					
						
						
							
							replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-15 11:23:14 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							2a1b7dee6d 
							
						 
					 
					
						
						
							
							tools: add zmqsend tool, useful to test the zmq filters  
						
						
						
						
					 
					
						2013-05-14 20:10:55 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4c8788e3 
							
						 
					 
					
						
						
							
							tools/ffeval: use av_dynarray2_add()  
						
						... 
						
						
						
						Simplify, increment robustness. 
						
						
					 
					
						2013-05-13 13:52:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							d9cb1e0e15 
							
						 
					 
					
						
						
							
							ffadler: fix duplicate \n on errors  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-09 16:54:04 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a11593189b 
							
						 
					 
					
						
						
							
							ffadler: add multifile support  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-09 16:21:25 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							3d66ce17b7 
							
						 
					 
					
						
						
							
							tools: Add adler32 checksum tool  
						
						... 
						
						
						
						This is about 6 times faster than md5sum on linux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-09 16:21:17 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0104570fb6 
							
						 
					 
					
						
						
							
							Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'  
						
						... 
						
						
						
						* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes
Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-04 10:17:52 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							a5f8873620 
							
						 
					 
					
						
						
							
							silly typo fixes  
						
						
						
						
					 
					
						2013-05-03 18:26:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ebea370dc3 
							
						 
					 
					
						
						
							
							ismindex: check mkdir()s return code  
						
						... 
						
						
						
						Fixes CID733724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-21 19:53:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							bc7330a840 
							
						 
					 
					
						
						
							
							tools/ismindex: dont ignore return code of write_fragments()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-21 19:49:22 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							231fd4411f 
							
						 
					 
					
						
						
							
							Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'  
						
						... 
						
						
						
						* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
  lavfi: merge avfiltergraph.h into avfilter.h
Conflicts:
	doc/APIchanges
	ffmpeg_filter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.h
	libavfilter/version.h
	tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-11 23:50:39 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							38f0c0781a 
							
						 
					 
					
						
						
							
							lavfi: merge avfiltergraph.h into avfilter.h  
						
						... 
						
						
						
						We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do. 
						
						
					 
					
						2013-04-11 20:33:33 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							89388a953a 
							
						 
					 
					
						
						
							
							Replace all occurrences of PRI in sscanf() calls with SCN  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2013-04-10 09:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ec1ef0838c 
							
						 
					 
					
						
						
							
							tools: add audio normalize script example.  
						
						
						
						
					 
					
						2013-03-26 01:50:13 +01:00