virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
68,359 Commits 37 Branches 400 Tags 458 MiB
81a045fe17
Commit Graph

347 Commits

Author SHA1 Message Date
Michael Niedermayer
7a19a8fb69 Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b' 
* commit '6f26f14f134e753d6168591f30815b1c08c1498b':
  sidxindex: Write mimeType=audio/mp4 for audio-only representations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-24 14:01:50 +01:00
Martin Storsjö
6f26f14f13 sidxindex: Write mimeType=audio/mp4 for audio-only representations 
This fixes playback with dash.js, when the input is one separate
mp4 file per track.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-24 09:23:14 +02:00
Michael Niedermayer
e60c025e73 Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c' 
* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c':
  tools: Add a sidxindex tool

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 23:09:22 +01:00
Martin Storsjö
c302d034ba tools: Add a sidxindex tool 
This tool can write an MPD file for fragmented MP4 files with
a sidx index at the start of the file.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-17 16:17:07 +02:00
Michael Niedermayer
39a7ded22d tools/ffhash: read errno before calling functions which might change it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 16:12:16 +02:00
Olivier Langlois
e205429fcf 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: Martin Storsjö <martin@martin.st>
 2014-10-24 09:53:43 +03:00
James Almer
e397edbfba tools/crypto_bench: add CAST5 support 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-21 22:15:43 -03:00
Michael Niedermayer
a9b613b60e Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de' 
* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
  ismindex: use tfhd default duration if no sample duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 12:45:01 +02:00
Mika Raento
979932378a ismindex: use tfhd default duration if no sample duration 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-16 09:22:22 +03:00
Michael Niedermayer
7b973e7341 Merge commit '2bc220958c7570020d87ee353db65460b518998a' 
* commit '2bc220958c7570020d87ee353db65460b518998a':
  ismindex: handle discontinuous streams better

Conflicts:
	tools/ismindex.c

See: d3834f2901
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 12:25:52 +02:00
Mika Raento
d3834f2901 ismindex: handle discontinuous streams better 
Reads the fragment duration from the trun sample data, rather than
assuming that there are no gaps. Creates much better playlists for our
inputs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 12:15:48 +02:00
Mika Raento
2bc220958c ismindex: handle discontinuous streams better 
Read the fragment duration from the trun sample data, rather than
assuming that there are no gaps.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-09 11:21:49 +03:00
Michael Niedermayer
4a99134f1a 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>
 2014-09-16 18:25:43 +02:00
Michael Niedermayer
2156161056 Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc' 
* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc':
  ismindex: handle time discontinuities and nonzero start time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-15 22:39:31 +02:00
Mika Raento
00431bf874 ismindex: handle time discontinuities and nonzero start time 
The input file may not have consistent start times, stream durations and
chunk durations. This patch at least removes negative durations that
make chromecast unhappy, and correctly sets starting time on chunks so
that the split (or .ismf) outputs match the manifest.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-15 19:54:36 +03:00
Michael Niedermayer
1a59a28838 Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0' 
* commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0':
  ismindex: Avoid writing ismf files if no base name has been specified

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-08 00:45:33 +02:00
Martin Storsjö
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
Michael Niedermayer
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
Mika Raento
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
Michael Niedermayer
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
Mika Raento
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
Michael Niedermayer
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
Mika Raento
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
Mark Harris
4cabee50f6 tools/normalize.py: both input and output file names are required 2014-09-02 07:31:34 +02:00
Reimar Döffinger
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
Michael Niedermayer
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
Diego Biurrun
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
Michael Niedermayer
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
Michael Niedermayer
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
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 '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
Michael Niedermayer
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
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 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 
* commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6':
  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 'bb95334c34d0d9abccea370ae25c4765d7764ab8' 
* commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8':
  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