summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAge
* Merge commit '2bc220958c7570020d87ee353db65460b518998a'Michael Niedermayer2014-10-09
|\ | | | | | | | | | | | | | | | | | | | | * commit '2bc220958c7570020d87ee353db65460b518998a': ismindex: handle discontinuous streams better Conflicts: tools/ismindex.c See: d3834f290138cb8c48fd404081ac5b9a2ca14564 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: handle discontinuous streams betterMika Raento2014-10-09
| | | | | | | | | | | | | | 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>
* | ismindex: handle discontinuous streams betterMika Raento2014-10-09
| | | | | | | | | | | | | | | | 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>
* | tools/crypto_bench: fix build when AV_READ_TIME is unavailableMichael Niedermayer2014-09-16
| | | | | | | | | | Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'Michael Niedermayer2014-09-15
|\| | | | | | | | | | | | | * commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc': ismindex: handle time discontinuities and nonzero start time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: handle time discontinuities and nonzero start timeMika Raento2014-09-15
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'Michael Niedermayer2014-09-08
|\| | | | | | | | | | | | | * commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0': ismindex: Avoid writing ismf files if no base name has been specified Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Avoid writing ismf files if no base name has been specifiedMartin Storsjö2014-09-07
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'Michael Niedermayer2014-09-05
|\| | | | | | | | | | | | | | | | | | | * commit 'b21e989a3c076d94cfdde0303724db841dd60cad': ismindex: produce .ismf file Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: produce .ismf fileMika Raento2014-09-05
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | * commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c': ismindex: recover from completely empty streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: recover from completely empty streamsMika Raento2014-09-03
| | | | | | | | | | | | | | 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>
* | Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'Michael Niedermayer2014-09-02
|\| | | | | | | | | | | | | | | | | | | * commit 'e48d1ea541be4592ebac89875557407ca958b7a9': ismindex: improve diagnostics Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: improve diagnosticsMika Raento2014-09-02
| | | | | | | | | | | | This improves error messages for completely and somewhat broken inputs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | tools/normalize.py: both input and output file names are requiredMark Harris2014-09-02
| |
* | patcheck: check for pointer arrays that are not const.Reimar Döffinger2014-08-29
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | * commit '3526ab891c28396ada8b58bf7647309bab30de1d': qt-faststart: Undefine fseeko/ftello before defining them Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Undefine fseeko/ftello before defining themDiego Biurrun2014-08-22
| | | | | | | | This avoids a number of redefinition warnings on MinGW64.
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Add missing initialization for AVProbeData.Reimar Döffinger2014-08-11
| | | | | | | | | | | | This has become necessary since the new mime field was added. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()James Almer2014-08-10
| | | | | | | | | | | | | | 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>
* | tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer2014-07-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tools/ffeval: print computed value even in case of errorStefano Sabatini2014-07-05
| | | | | | | | This is useful for debugging purposes.
* | Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'Michael Niedermayer2014-07-03
|\| | | | | | | | | | | | | | | | | | | * 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>
| * ismindex: Add an option for outputting files elsewhere than in the current ↵Martin Storsjö2014-07-03
| | | | | | | | | | | | directory Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'Michael Niedermayer2014-07-03
|\| | | | | | | | | | | | | * commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e': ismindex: Allow adding a path prefix to the generated .ism file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Allow adding a path prefix to the generated .ism fileMartin Storsjö2014-07-03
| | | | | | | | | | | | | | | | 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>
| * qt-faststart: Add a note about the -movflags +faststart featureLou Logan2014-03-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NBMichael Niedermayer2014-06-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tools: Use av_gettime_relative()Olivier Langlois2014-05-17
| | | | | | | | | | | | | | | | | | 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>
* | tools/ismindex: use av_mallocz_array()Michael Niedermayer2014-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add codec descriptors for TTF and OTF.Nicolas George2014-04-29
| |
* | tools/ffhash: implement base64 output.Nicolas George2014-04-29
| | | | | | | | Also fix usage string: the algorithm is not optional.
* | tools/ffhash: use av_hash_final_hex().Nicolas George2014-04-29
| |
* | tools/uncoded_frame: fix audio codec generationLukasz Marek2014-03-29
| | | | | | | | | | | | Codec id is guessed from uninitialized sample format. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | tools: add dvd2concat.Nicolas George2014-03-23
| |
* | tools/build_libstagefright: switch git urls to httpsMichael Niedermayer2014-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | * commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6': qt-faststart: Avoid unintentionally sign extending BE_32 See: 582f36ca3fb1c69dbe3478f174d36278f5dd3f63 See: 69ce34c796dd2d595f3312848cf6d0c87506e0d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Avoid unintentionally sign extending BE_32Martin Storsjö2014-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8': qt-faststart: Check offset_count before reading from the moov_atom buffer Conflicts: tools/qt-faststart.c See: 0ea4742341726ebe42c301bc0d6426cfa01dd134 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check offset_count before reading from the moov_atom bufferMichael Niedermayer2014-03-01
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '63848854256a024a19435e87d6bc76fffa65e81e': qt-faststart: Check the ftello() return codes Conflicts: tools/qt-faststart.c See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check the ftello() return codesMichael Niedermayer2014-03-01
| | | | | | | | | | | | This silences a warning in the coverity static analyzer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b': qt-faststart: Fix the signedness of variables keeping the ftello return values Conflicts: tools/qt-faststart.c See: 1838961357e38402be64c0c82a2f08e4e85a0c01 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Fix the signedness of variables keeping the ftello return valuesMichael Niedermayer2014-03-01
| | | | | | | | | | | | | | | | 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>
* | Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475': qt-faststart: Check fseeko() return codes Conflicts: tools/qt-faststart.c See: 0de41ead6f9034e0a834abe51028a02aee094990 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check fseeko() return codesMichael Niedermayer2014-03-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>