sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-13 00:42:49 +03:00
Code Activity
48,920 Commits 41 Branches 434 Tags
e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer e7e0186eeb Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d' 
* commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d':
  lavf: Add functions for SRTP decryption/encryption
  lavu: Add an API for calculating HMAC (RFC 2104)

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-15 15:57:33 +01:00
compat
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
2012-10-24 13:42:58 +02:00
doc
Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
2013-01-15 15:57:33 +01:00
libavcodec
Merge commit '47812070a267cbdf74164e154d03d99bf8ced100'
2013-01-15 15:51:14 +01:00
libavdevice
Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'
2013-01-14 14:16:21 +01:00
libavfilter
Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'
2013-01-14 14:43:32 +01:00
libavformat
Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
2013-01-15 15:57:33 +01:00
libavresample
Merge remote-tracking branch 'qatar/master'
2013-01-09 12:30:14 +01:00
libavutil
Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
2013-01-15 15:57:33 +01:00
libpostproc
build: postproc cleanup.
2012-12-30 02:27:52 +01:00
libswresample
swr/dither: fix division by 0
2013-01-14 02:57:00 +01:00
libswscale
Merge remote-tracking branch 'qatar/master'
2013-01-05 13:37:30 +01:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'
2013-01-13 13:54:52 +01:00
tools
Fix "knwon" typo and add a check in tools/patcheck
2013-01-04 19:24:37 +00:00
.gitignore
Add examples/resampling_audio to .gitignore.
2012-12-06 12:13:01 +01:00
arch.mak
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
2012-12-08 14:24:16 +01:00
Changelog
Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'
2013-01-14 13:29:00 +01:00
cmdutils_common_opts.h
cmdutils: implement debug/fdebug log level update differently.
2012-12-20 02:38:18 +01:00
cmdutils.c
cmdutils: update copyright year to 2013
2013-01-03 13:35:12 +02:00
cmdutils.h
lavf: remove nonexistent symbols
2013-01-11 10:07:52 +00:00
common.mak
Merge remote-tracking branch 'qatar/master'
2012-12-11 08:24:45 +01:00
configure
Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'
2013-01-15 15:23:20 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
cosmetics: Delete empty lines at end of file.
2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
…
CREDITS
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
ffmpeg_filter.c
ffmpeg: sub2video: set resample size.
2013-01-01 23:06:34 +01:00
ffmpeg_opt.c
Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'
2013-01-15 15:32:48 +01:00
ffmpeg.c
add note on windows pipe
2013-01-06 17:47:49 +01:00
ffmpeg.h
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
2012-12-20 02:38:02 +01:00
ffplay.c
ffplay: fix sws_flags
2013-01-13 22:48:28 +01:00
ffprobe.c
ffprobe: do not escape '"' between single quotes.
2013-01-01 13:32:51 +01:00
ffserver.c
ffserver: add missing padding to extradata.
2012-12-30 22:22:18 +01:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Merge remote-tracking branch 'qatar/master'
2012-12-11 08:24:45 +01:00
LICENSE
lavfi: add histeq filter
2013-01-05 10:25:32 +01:00
MAINTAINERS
MAINTAINERS: add 1.1, remove 0.10
2013-01-06 21:42:35 +01:00
Makefile
Merge remote-tracking branch 'qatar/master'
2012-12-11 08:24:45 +01:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
RELEASE: 1.1.git for master
2013-01-06 21:42:35 +01:00
version.sh
version.sh: handle shallow clones and snapshots.
2011-07-22 10:43:59 +02: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 451 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%