wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
65788 commits 40 branches 405 tags 230 MiB
Commit graph

320 commits

Author SHA1 Message Date
Michael Niedermayer
60dbed6067 Merge commit '4b1f5e5090' 
* commit '4b1f5e5090':
  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
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569' 
* commit 'f929ab0569':
  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
Gabriel Dume
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
Reimar Döffinger
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
James Almer
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
Michael Niedermayer
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
Stefano Sabatini
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
Michael Niedermayer
524eeaca22 Merge commit 'f920d08953' 
* commit 'f920d08953':
  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
Michael Niedermayer
0d35d5ab1b Merge commit '6bc4934b75' 
* commit '6bc4934b75':
  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
Martin Storsjö
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
Martin Storsjö
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
Michael Niedermayer
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
Lou Logan
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
Olivier Langlois
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
Michael Niedermayer
b395167d56 tools/ismindex: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 18:47:24 +02:00
Nicolas George
892e2c2ad8 lavc: add codec descriptors for TTF and OTF. 2014-04-29 13:24:18 +02:00
Nicolas George
73c4b6ce4b tools/ffhash: implement base64 output. 
Also fix usage string: the algorithm is not optional.
 2014-04-29 13:24:17 +02:00
Nicolas George
3926a30b58 tools/ffhash: use av_hash_final_hex(). 2014-04-29 13:24:17 +02:00
Lukasz Marek
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
Nicolas George
27cff4f6f8 tools: add dvd2concat. 2014-03-23 19:15:07 +01:00
Michael Niedermayer
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
Michael Niedermayer
06fe29c41d Merge commit 'ea7f79f937' 
* commit 'ea7f79f937':
  qt-faststart: Avoid unintentionally sign extending BE_32

See: 582f36ca3f
See: 69ce34c796
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 14:44:58 +01:00
Michael Niedermayer
7fa3ec88da Merge commit 'bb95334c34' 
* commit 'bb95334c34':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
	tools/qt-faststart.c

See: 0ea4742341
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 14:33:45 +01:00
Michael Niedermayer
77c235206a Merge commit '6384885425' 
* commit '6384885425':
  qt-faststart: Check the ftello() return codes

Conflicts:
	tools/qt-faststart.c

See: 4a2297294f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 14:19:04 +01:00
Michael Niedermayer
817f8138cb Merge commit '03c2a66fcf' 
* commit '03c2a66fcf':
  qt-faststart: Fix the signedness of variables keeping the ftello return values

Conflicts:
	tools/qt-faststart.c

See: 1838961357
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 14:12:39 +01:00
Michael Niedermayer
11c4bc9a74 Merge commit '5612244351' 
* commit '5612244351':
  qt-faststart: Check fseeko() return codes

Conflicts:
	tools/qt-faststart.c

See: 0de41ead6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 13:55:16 +01:00
Michael Niedermayer
0bb474f686 Merge commit 'ea15a9a5d8' 
* commit 'ea15a9a5d8':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

See: 59003fe7c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 13:47:08 +01:00
Lou Logan
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
Martin Storsjö
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
5612244351 qt-faststart: Check fseeko() return codes 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-03-01 00:24:52 +02:00
Michael Niedermayer
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
Martin Storsjö
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
Lukasz Marek
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
Nicolas George
8400368f31 tools: add uncoded_frame test program. 2014-02-11 10:31:29 +01:00
Michael Niedermayer
c8b99f8ad0 Merge commit '87acd33c09' 
* commit '87acd33c09':
  aviocat: Add support for specifying the input duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 14:38:33 +01:00
Michael Niedermayer
9f3a555b84 Merge commit '03f2de5856' 
* commit '03f2de5856':
  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