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
94,815 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%
3ad5d4df9c
Go to file
Calvin Walton 3ad5d4df9c lavfi/concat: allow to support inputs with different frame rates 
Right now, the concat filter does not set the frame_rate value on any of
the out links. As a result, the default ffmpeg behaviour kicks in - to
copy the framerate from the first input to the outputs.

If a later input is higher framerate, this results in dropped frames; if
a later input is lower framerate it might cause judder.

This patch checks if all of the video inputs have the same framerate, and
if not it sets the out link to use '1/0' as the frame rate, the value
meaning "unknown/vfr".

A test is added to verify the VFR behaviour. The existing test for CFR
behaviour passes unchanged.
2019-09-08 16:48:28 +02:00
compat compat/cuda: Change inclusion guards 2019-08-05 12:07:09 +02:00
doc avfilter/vf_v360: add options to h/w unflip input video 2019-09-07 22:36:28 +02:00
ffbuild build: add support for building CUDA files with clang 2019-08-04 19:08:08 +02:00
fftools ffmpeg: switch to avformat_seek_file for stream_loop 2019-09-05 23:23:11 +05:30
libavcodec avcodec/qdm2: Check frame size 2019-09-06 22:26:55 +02:00
libavdevice libavdevice: Update the class name as uniform style 2019-08-15 09:29:55 +08:00
libavfilter lavfi/concat: allow to support inputs with different frame rates 2019-09-08 16:48:28 +02:00
libavformat avformat/vividas: check for tiny blocks using alignment 2019-09-06 22:25:35 +02:00
libavresample avresample: remove deprecated attribute from the AVAudioResampleContext struct 2018-01-09 10:56:53 -03:00
libavutil avutil/version: bump for hwcontext_videotoolbox api change 2019-09-04 12:56:25 -07:00
libpostproc Bump minor versions again on master to keep 4.2 versions separate from master 2019-07-21 18:36:31 +02:00
libswresample Bump minor versions again on master to keep 4.2 versions separate from master 2019-07-21 18:36:31 +02:00
libswscale swscale/output: fix some code indentations 2019-09-06 22:06:12 +02:00
presets
tests lavfi/concat: allow to support inputs with different frame rates 2019-09-08 16:48:28 +02:00
tools libavfilter/dnn: add header into native model file 2019-09-04 11:13:21 -03:00
.gitattributes fate: add SCC test 2017-01-27 17:06:42 +01:00
.gitignore tools/python: add script to convert TensorFlow model (.pb) to native model (.model) 2019-07-01 10:23:47 -03:00
.travis.yml Merge commit '899ee03088d55152a48830df0899887f055da1de' 2019-03-14 15:53:16 -03:00
Changelog avformat: Add ZeroMQ as a protocol 2019-09-02 23:08:43 +02:00
configure configure: fix --disable-v4l2-m2m can't work 2019-09-05 18:55:09 +08: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 LICENSE: Add missing libraries that need --enable-version3. 2019-08-12 02:25:39 +02:00
MAINTAINERS MAINTAINERS: add myself to OMX 2019-08-23 17:07:05 -07:00
Makefile tools: Add fuzzer for demuxers 2019-05-31 22:44:30 +02:00
README.md Remove the ffserver program 2018-01-06 18:31:37 +00:00
RELEASE RELEASE: Update value for post 4.2 branch 2019-07-21 18:37:32 +02: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.