fcf597625c
ismindex: Avoid writing ismf files if no base name has been specified
...
Previously, this could create files named "(null).ismf", if the -ismf
parameter is specified (before an input file name), but without
specifying any base name.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-07 23:20:30 +03:00
0940066b80
Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
...
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
ismindex: produce .ismf file
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:14:42 +02:00
b21e989a3c
ismindex: produce .ismf file
...
This is a non-standard file that maps the MSS segment names to offsets
in the ISMV file. This can be used to build a custom MSS streaming
server without splitting the ISMV into separate files.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-05 09:54:55 +03:00
d9a416fa1a
Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'
...
* commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c':
ismindex: recover from completely empty streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 15:04:34 +02:00
c487972ed0
ismindex: recover from completely empty streams
...
This creates best-effort results from input that is missing stream
contents, there are warnings printed when this happens.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-03 12:06:40 +03:00
35469835bb
Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'
...
* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
ismindex: improve diagnostics
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 11:20:13 +02:00
e48d1ea541
ismindex: improve diagnostics
...
This improves error messages for completely and somewhat broken inputs.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-02 09:48:44 +03:00
4cabee50f6
tools/normalize.py: both input and output file names are required
2014-09-02 07:31:34 +02:00
be4aac302b
patcheck: check for pointer arrays that are not const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29 18:57:25 +02:00
d2a0624296
Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'
...
* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
qt-faststart: Undefine fseeko/ftello before defining them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 21:55:27 +02:00
3526ab891c
qt-faststart: Undefine fseeko/ftello before defining them
...
This avoids a number of redefinition warnings on MinGW64.
2014-08-22 18:35:20 +02:00
60dbed6067
Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
...
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:26:12 +02:00
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
4b1f5e5090
cosmetics: Write NULL pointer inequality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15 05:34:13 -07:00
2c0454cd20
Add missing initialization for AVProbeData.
...
This has become necessary since the new mime field was added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-11 21:10:22 +02:00
ddce2b2654
tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()
...
lavc doesn't export ff_raw_pix_fmt_tags[] anymore.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 04:50:31 +02:00
1574eedd0e
tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 01:56:33 +02:00
60f162946f
tools/ffeval: print computed value even in case of error
...
This is useful for debugging purposes.
2014-07-05 11:48:24 +02:00
524eeaca22
Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'
...
* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
ismindex: Add an option for outputting files elsewhere than in the current directory
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 21:02:56 +02:00
0d35d5ab1b
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
...
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
ismindex: Allow adding a path prefix to the generated .ism file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 20:37:06 +02:00
f920d08953
ismindex: Add an option for outputting files elsewhere than in the current directory
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-03 20:13:27 +03:00
6bc4934b75
ismindex: Allow adding a path prefix to the generated .ism file
...
This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-03 20:13:13 +03:00
9c9eac5c26
tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 04:00:06 +02:00
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
41120e6e40
tools: Use av_gettime_relative()
...
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-17 15:51:58 +02:00
b395167d56
tools/ismindex: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 18:47:24 +02:00
892e2c2ad8
lavc: add codec descriptors for TTF and OTF.
2014-04-29 13:24:18 +02:00
73c4b6ce4b
tools/ffhash: implement base64 output.
...
Also fix usage string: the algorithm is not optional.
2014-04-29 13:24:17 +02:00
3926a30b58
tools/ffhash: use av_hash_final_hex().
2014-04-29 13:24:17 +02:00
fd786bad63
tools/uncoded_frame: fix audio codec generation
...
Codec id is guessed from uninitialized sample format.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-29 09:25:14 +01:00
27cff4f6f8
tools: add dvd2concat.
2014-03-23 19:15:07 +01:00
98eb99d20b
tools/build_libstagefright: switch git urls to https
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:07:00 +01:00
06fe29c41d
Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'
...
* commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6':
qt-faststart: Avoid unintentionally sign extending BE_32
See: 582f36ca3f69ce34c796
2014-03-01 14:44:58 +01:00
7fa3ec88da
Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'
...
* commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8':
qt-faststart: Check offset_count before reading from the moov_atom buffer
Conflicts:
tools/qt-faststart.c
See: 0ea4742341
2014-03-01 14:33:45 +01:00
77c235206a
Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'
...
* commit '63848854256a024a19435e87d6bc76fffa65e81e':
qt-faststart: Check the ftello() return codes
Conflicts:
tools/qt-faststart.c
See: 4a2297294f
2014-03-01 14:19:04 +01:00
817f8138cb
Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'
...
* commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b':
qt-faststart: Fix the signedness of variables keeping the ftello return values
Conflicts:
tools/qt-faststart.c
See: 1838961357
2014-03-01 14:12:39 +01:00
11c4bc9a74
Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'
...
* commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475':
qt-faststart: Check fseeko() return codes
Conflicts:
tools/qt-faststart.c
See: 0de41ead6f
2014-03-01 13:55:16 +01:00
0bb474f686
Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
...
* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
qt-faststart: Simplify code by using a MIN() macro
Conflicts:
tools/qt-faststart.c
See: 59003fe7c0
2014-03-01 13:47:08 +01:00
700687ebe0
qt-faststart: Add a note about the -movflags +faststart feature
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:25:17 +02:00
ea7f79f937
qt-faststart: Avoid unintentionally sign extending BE_32
...
Without this cast, the BE_32() expression is sign extended when
assigned to an uint64_t, since the uint8_t|uint8_t expression
is promoted to an int.
Also avoid undefined behaviour when left shifting an uint8_t
by 24 by casting it to an uint32_t explicitly before shifting.
Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:25:08 +02:00
bb95334c34
qt-faststart: Check offset_count before reading from the moov_atom buffer
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:25:04 +02:00
6384885425
qt-faststart: Check the ftello() return codes
...
This silences a warning in the coverity static analyzer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:25:00 +02:00
03c2a66fcf
qt-faststart: Fix the signedness of variables keeping the ftello return values
...
These variables are assigned the return values of ftello, which
returns an off_t, which is a signed type. On errors, ftello returns
-1, thus make sure this error return value can be stored properly.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:24:55 +02:00
5612244351
qt-faststart: Check fseeko() return codes
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:24:52 +02:00
ea15a9a5d8
qt-faststart: Simplify code by using a MIN() macro
...
qt-faststart doesn't use the normal libav headers at all since
it's supposed to be a completely standalone tool, so we implement
the macro locally in this file.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:24:47 +02:00
3cbc7ef3d6
qt-faststart: Increase the copy buffer size to 64 KB
...
Copying data in chunks of 1 KB is a little wasteful.
64 KB should still easily fit on the stack, so there's no need
to allocate it dynamically.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-01 00:24:42 +02:00
9c3478c234
tools/uncoded_frame: fix double free
...
in case av_interleaved_write_uncoded_frame fails it seems
frame is freed for the second time in fail section.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
This commit also removes 1 trailing whitespace as otherwise the push hook rejects it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-13 01:29:01 +01:00
8400368f31
tools: add uncoded_frame test program.
2014-02-11 10:31:29 +01:00
c8b99f8ad0
Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'
...
* commit '87acd33c092ab9e7d73686627e9105d99c1e4928':
aviocat: Add support for specifying the input duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17 14:38:33 +01:00
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
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
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
2574d62d0d
tools/qt-faststart: add -movflags +faststart note
2014-01-07 10:59:04 -09:00
129ce05b02
tools/zmqsend: rename ctx to zmq_ctx
...
The new name is more explicit.
2013-12-23 18:44:52 +01:00
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
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
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
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
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
82c86d0b18
graph2dot: Add missing #include for av_get_channel_layout_string()
2013-11-04 23:04:10 +01:00
48715285f6
graph2dot: Fix use of deprecated API
2013-11-04 23:04:10 +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
Martin Storsjö
Michael Niedermayer
Mika Raento
Mark Harris
Reimar Döffinger
Diego Biurrun
Gabriel Dume
James Almer
Stefano Sabatini
Lou Logan
Olivier Langlois
Nicolas George
Lukasz Marek
Timothy Gu
Alex Smith
Clément Bœsch
Nicolas George
Thilo Borgmann
Clément Bœsch
Anton Khirnov