sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-09 23:48:13 +03:00
Code Activity
61,549 Commits 41 Branches 434 Tags
ba7cdb970f1cb49ae7a99948dae6b88d163545fe
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer ba7cdb970f Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851' 
* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df18270a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:51:45 +01:00
compat
Merge remote-tracking branch 'qatar/master'
2014-03-10 12:05:02 +01:00
doc
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
2014-03-17 14:41:13 +01:00
libavcodec
Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
2014-03-17 15:33:17 +01:00
libavdevice
Merge remote-tracking branch 'cigaes/master'
2014-03-08 15:00:36 +01:00
libavfilter
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)
2014-03-16 17:25:54 +01:00
libavformat
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
2014-03-17 15:43:55 +01:00
libavresample
Merge remote-tracking branch 'qatar/master'
2014-02-22 21:12:02 +01:00
libavutil
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
2014-03-17 14:41:13 +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
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
2014-03-17 14:41:13 +01:00
presets
…
tests
avformat/movenc: only ommit encoder tag of the metadata for bitexact mode
2014-03-16 16:26:35 +01:00
tools
tools/build_libstagefright: switch git urls to https
2014-03-12 23:07:00 +01:00
.gitignore
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
2014-02-25 20:26:00 +01:00
arch.mak
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
Changelog
Changelog: move post 2.2 branching entries out of the 2.2 changelog
2014-03-16 19:15:58 +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
avconv: Match stream id
2014-03-13 11:59:34 +01: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 'be039278b5ebd8075d90a3508db2aed5adf59e02'
2014-03-17 13:23:48 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
ffmpeg_filter.c
…
ffmpeg_opt.c
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
…
ffmpeg.c
ffmpeg: fix printing INT64_MIN pts at the end
2014-03-16 06:26:40 +01:00
ffmpeg.h
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
2014-02-24 21:08:19 +01:00
ffplay.c
ffplay: display information on stream cycling
2014-03-12 00:32:38 +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
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
README
…
RELEASE
Prepare for 11_alpha1 Release
2014-03-13 08:24:11 -04: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 448 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%