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
Mirror of https://git.ffmpeg.org/ffmpeg.git
93,208 Commits 37 Branches 400 Tags 458 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
bfa33f548d
Go to file
Adam Sampson bfa33f548d lavf/jacosubdec: compute subtitle duration correctly 
When a JACOsub subtitle has two timestamps, they represent its start and
end times (http://unicorn.us.com/jacosub/jscripts.html#l_times); the
duration is the difference between the two, not the sum of the two.

The subtitle end times in the FATE test for this were wrong as a result;
fix them too. (This test is based on JACOsub's demo.txt, and the end
time computed for the last line using @ now matches what the comments
there say it should be.)

Also tested in practice using MPV, a LaserDisc, and some authentic 1993
JACOsub files.

Signed-off-by: Adam Sampson <ats@offog.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-02-20 21:15:07 +01:00
compat additional math.h functions for djgpp 2018-11-28 22:16:07 +11:00
doc doc/libav-merge: add a line about the previous skipped merge 2019-02-20 13:51:19 -03:00
ffbuild Merge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c' 2017-11-12 01:02:02 -03:00
fftools ffplay: add support for setting the number of filter threads 2019-02-07 23:38:53 +01:00
libavcodec Merge commit 'eec93e57096aa4804862d62760442380c70d489b' 2019-02-20 15:43:30 -03:00
libavdevice libavdevice/gdigrab: fix HIDPI support for mouse positioning 2019-01-30 21:55:22 +01:00
libavfilter palettegen: Fill with last color, not black 2019-02-19 21:29:03 +01:00
libavformat lavf/jacosubdec: compute subtitle duration correctly 2019-02-20 21:15:07 +01:00
libavresample avresample: remove deprecated attribute from the AVAudioResampleContext struct 2018-01-09 10:56:53 -03:00
libavutil Merge commit '41cf3e3b1ca375962951fde1b90a03b16197d205' 2019-02-20 14:48:58 -03:00
libpostproc postproc/postprocess_template: remove FF_REG_sp from clobber list 2018-12-22 17:41:44 +01:00
libswresample Bump minor version for master after 4.1 branchpoint 2018-11-02 00:53:07 +01:00
libswscale libswscale/ppc: VSX-optimize 9-16 bit yuv2planeX 2019-02-05 09:34:53 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests lavf/jacosubdec: compute subtitle duration correctly 2019-02-20 21:15:07 +01:00
tools tools/target_dec_fate.list: Extend selftests upto issue 2000 2019-02-09 14:40:50 +01:00
.gitattributes fate: add SCC test 2017-01-27 17:06:42 +01:00
.gitignore Remove the ffserver program 2018-01-06 18:31:37 +00:00
.travis.yml Merge commit '4809781586d1c956005f72946a2aab5915eab350' 2017-10-28 15:08:31 -03:00
Changelog avcodec/version: Bump micro-version for nvdec/cuviddec changes 2019-02-16 10:43:24 -08:00
configure configure: fix dependencies for mlp and truehd encoders 2019-02-12 22:53:03 +01:00
CONTRIBUTING.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
INSTALL.md INSTALL.md: Fix Markdown formatting 2019-01-31 10:29:16 -09:00
LICENSE.md Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c' 2017-03-15 22:07:47 +01:00
MAINTAINERS MAINTAINERS: add myself to the PPC section 2019-02-04 19:14:20 +01:00
Makefile Makefile: Allow "make clean" to delete compat/atomics/pthread/stdatomic.o 2018-12-28 14:04:10 +01:00
README.md Remove the ffserver program 2018-01-06 18:31:37 +00:00
RELEASE RELEASE: bump to 4.1.git 2018-11-02 00:55:49 +01:00

README.md

FFmpeg README

FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata.

Libraries

  • libavcodec provides implementation of a wider range of codecs.
  • libavformat implements streaming protocols, container formats and basic I/O access.
  • libavutil includes hashers, decompressors and miscellaneous utility functions.
  • libavfilter provides a mean to alter decoded Audio and Video through chain of filters.
  • libavdevice provides an abstraction to access capture and playback devices.
  • libswresample implements audio mixing and resampling routines.
  • libswscale implements color conversion and scaling routines.

Tools

  • ffmpeg is a command line toolbox to manipulate, convert and stream multimedia content.
  • ffplay is a minimalistic multimedia player.
  • ffprobe is a simple analysis tool to inspect multimedia content.
  • Additional small tools such as aviocat, ismindex and qt-faststart.

Documentation

The offline documentation is available in the doc/ directory.

The online documentation is available in the main website and in the wiki.

Examples

Coding examples are available in the doc/examples directory.

License

FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.

Contributing

Patches should be submitted to the ffmpeg-devel mailing list using git format-patch or git send-email. Github pull requests should be avoided because they are not part of our review process and will be ignored.