sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-08 11:07:56 +03:00
Code Activity
61,110 Commits 41 Branches 434 Tags
2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 2fb0027c26 Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
  lavfi: add shuffleplanes filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 13:07:20 +01:00
compat
compat: provide va_copy for old gcc versions.
2013-12-30 12:38:03 +01:00
doc
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
2014-03-06 13:07:20 +01:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2014-03-05 21:35:30 +01:00
libavdevice
lavd/avdevice: always free detected devices on error
2014-03-06 00:34:50 +01:00
libavfilter
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
2014-03-06 13:07:20 +01:00
libavformat
Merge remote-tracking branch 'lukaszmluki/master'
2014-03-06 02:04:18 +01:00
libavresample
Merge remote-tracking branch 'qatar/master'
2014-02-22 21:12:02 +01:00
libavutil
Revert "lavu/buffer: add release function"
2014-03-06 03:23:40 +01:00
libpostproc
postproc: fix null pointer dereference with invalid option strings
2013-12-11 22:28:42 +01:00
libswresample
swr: check that the context for swr_convert() has been initialized
2014-02-24 08:23:42 +01:00
libswscale
libswscale: bayer to rgb24 & yv12 colorspace converters
2014-02-23 02:38:22 +01:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used
2014-02-22 22:39:50 +01:00
tools
Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'
2014-03-01 14:44:58 +01:00
.gitignore
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
2014-02-25 20:26:00 +01:00
arch.mak
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
2012-12-08 14:24:16 +01:00
Changelog
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
2014-03-06 13:07:20 +01:00
cmdutils_common_opts.h
Allow hiding the banner.
2013-12-29 22:57:20 +01:00
cmdutils_opencl.c
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
cmdutils.c
cmdutils: update copyright year to 2014.
2014-01-05 22:39:35 +02:00
cmdutils.h
Allow hiding the banner.
2013-12-29 22:57:20 +01:00
common.mak
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
configure
Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'
2014-03-05 13:45:23 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
CREDITS: redirect to Git log, remove current outdated content
2013-01-31 18:02:52 +01:00
ffmpeg_filter.c
Merge remote-tracking branch 'qatar/master'
2013-11-24 05:21:19 +01:00
ffmpeg_opt.c
ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check
2014-02-25 00:05:37 +01:00
ffmpeg_vdpau.c
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffmpeg.c
ffmpeg: dont try to run the subtitle encoder on non subtitle streams
2014-03-03 21:06:24 +01:00
ffmpeg.h
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
2014-02-24 21:08:19 +01:00
ffplay.c
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
2014-02-10 13:26:31 +01:00
ffprobe.c
ffprobe: check av_frame_alloc() failure.
2013-12-30 10:58:01 +01:00
ffserver.c
ffserver: merge RTSP's teardown & pause routines
2014-02-14 14:31:42 -03:00
INSTALL
…
library.mak
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
LICENSE
Add libx265 encoder
2014-02-12 13:13:17 +00:00
MAINTAINERS
update for 2.2
2014-03-01 03:34:59 +01:00
Makefile
tools: add uncoded_frame test program.
2014-02-11 10:31:29 +01:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
RELEASE: update for 2.2
2014-03-01 17:09:12 +01:00
version.sh
version.sh: add preprocessing guards
2013-11-30 21:42:03 +01:00

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.
View Git Blame Copy Permalink
Description
FFmpeg - это набор библиотек и инструментов для обработки мультимедийного контента, такого как аудио, видео, субтитры и связанные с ними метаданные
https://ffmpeg.org/
audioconvertervideo
Readme 447 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%