5e4a821b8a
tools/crypto_bench: fix build when AV_READ_TIME is unavailable
...
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a99134f1a
2014-11-28 18:44:37 +01:00
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
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
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
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
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
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
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
eedbc2b56d
tools: Fix apparent merge failure
2013-09-21 14:40:31 +02:00
bc68927a0f
tools/crypto_bench: fix 2 typos.
2013-09-04 21:59:34 +02:00
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
d814a839ac
Reinstate proper FFmpeg license for all files.
2013-08-30 15:47:38 +00:00
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
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
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
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
cd7b6deeaa
tools: Wording and formatting cosmetics
2013-07-06 15:36:57 +02:00
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
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
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
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
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
56f7e29dba
tools: add zmqshell.py.
2013-05-19 17:59:21 +02:00
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
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
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
2a1b7dee6d
tools: add zmqsend tool, useful to test the zmq filters
2013-05-14 20:10:55 +02:00
3a4c8788e3
tools/ffeval: use av_dynarray2_add()
...
Simplify, increment robustness.
2013-05-13 13:52:37 +02:00
d9cb1e0e15
ffadler: fix duplicate \n on errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 16:54:04 +02:00
a11593189b
ffadler: add multifile support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 16:21:25 +02:00
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
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
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
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
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
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
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
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
ec1ef0838c
tools: add audio normalize script example.
2013-03-26 01:50:13 +01:00
ecade984ac
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
...
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:09:37 +01:00
905e7eb413
Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'
...
* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
ismindex: Check the return value of allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:15:02 +01:00
360d71707f
Merge commit '7c147900b86c0f1cf030b7b844c670649c80c191'
...
* commit '7c147900b86c0f1cf030b7b844c670649c80c191':
ismindex: Factorize code for printing chunk duration lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 11:58:17 +01:00
33ecf7ab59
Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'
...
* commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591':
ismindex: Rename structs and fields from "file" to "track"
avpacket: copy side data type and size in av_dup_packet
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 11:48:42 +01:00
4abf6fa095
ismindex: Check the return value of allocations
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13 20:41:25 +02:00
7c147900b8
ismindex: Factorize code for printing chunk duration lists
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13 20:41:19 +02:00
f05e9beb4a
ismindex: Rename structs and fields from "file" to "track"
...
The tool nowadays supports more than one track per file,
this makes reading the code slightly less confusing.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13 20:41:11 +02:00
9767ec6b86
lavu: add escape API
...
The escape API will be useful to perform escaping programmatically, which
is required when crafting argument strings, and will be used for context
printing as well.
This is based on the ffescape tool code, with a few extensions and fixes.
2013-03-07 01:12:04 +01:00
c53e8d9029
Include fix for building ismindex under MinGW
...
Include cmdutils.h so we can build under windows.
Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256
2013-02-27 10:13:09 -07:00
b92c7a8f4b
tools: add seek_print.
...
Useful for testing seek implementations.
2013-02-24 13:12:46 +01:00
ac8987591f
Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
...
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
Drop DCTELEM typedef
Conflicts:
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/motion_est_alpha.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/pixels_bfin.S
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dct-test.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/eamad.c
libavcodec/h264_cavlc.c
libavcodec/h264idct_template.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/proresdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:44:56 +01:00
Michael Niedermayer
Martin Storsjö
Alex Smith
Clément Bœsch
Nicolas George
Thilo Borgmann
Diego Biurrun
Clément Bœsch
James Almer
Stefano Sabatini
Anton Khirnov
Frederic Jean