sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-14 21:58:33 +03:00
Code Activity
40,121 Commits 41 Branches 434 Tags
3ead79eaa3f77451bc93cb842ed7b38c94858045
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 3ead79eaa3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: use updated reference for aac-latm_stereo_to_51
  avconv: use libavresample
  Add libavresample
  FATE: avoid channel mixing in lavf-dv_fmt

Conflicts:
	Changelog
	Makefile
	cmdutils.c
	configure
	doc/APIchanges
	ffmpeg.c
	tests/lavf-regression.sh
	tests/ref/lavf/dv_fmt
	tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-25 23:17:41 +02:00
doc
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
ffpresets
Merge remote-tracking branch 'qatar/master'
2011-10-20 02:34:51 +02:00
libavcodec
ffv1: remove clear_state(), it has become unused
2012-04-25 18:05:40 +02:00
libavdevice
Merge remote-tracking branch 'qatar/master'
2012-04-04 21:17:52 +02:00
libavfilter
avfiltergraph: fix format selection.
2012-04-24 16:35:15 +02:00
libavformat
Merge remote-tracking branch 'qatar/master'
2012-04-24 23:45:09 +02:00
libavresample
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
libavutil
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
libpostproc
libpostproc: fix out of array accesses detected by AddressSanitizer.
2012-02-29 04:25:13 +01:00
libswresample
fix swr_convert buffering of packed audio
2012-04-21 01:57:21 +02:00
libswscale
Merge remote-tracking branch 'qatar/master'
2012-04-24 02:30:41 +02:00
mt-work
Update todo
2011-06-12 18:01:29 +02:00
presets
Remove redundant libx264 preset files
2011-10-22 01:32:10 +02:00
tests
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
tools
Merge remote-tracking branch 'hexene/stagefright'
2012-04-19 01:58:30 +02:00
.gitignore
Merge remote-tracking branch 'qatar/master'
2012-03-25 23:10:30 +02:00
arch.mak
build: Consistently handle conditional compilation for all optimization OBJS.
2012-04-12 09:00:49 +02:00
Changelog
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
cmdutils_common_opts.h
cmdutils: fix -fdebug without -v xy
2012-04-05 21:50:50 +02:00
cmdutils.c
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
cmdutils.h
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
2012-04-17 04:03:50 +02:00
common.mak
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
configure
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
COPYING.GPLv2
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
COPYING.GPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
cosmetics: Delete empty lines at end of file.
2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
CREDITS
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
Doxyfile
remove avconv from Doxyfile
2012-01-25 22:47:45 +01:00
ffmpeg.c
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
ffplay.c
lowres2 support.
2012-04-22 22:26:55 +02:00
ffprobe.c
ffprobe: do not try to decode empty packets.
2012-04-21 14:02:08 +02:00
ffserver.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Merge remote-tracking branch 'qatar/master'
2012-03-26 20:52:52 +02:00
LICENSE
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
MAINTAINERS
ZeroCodec Decoder
2012-03-19 00:19:13 +01:00
Makefile
Merge remote-tracking branch 'qatar/master'
2012-04-25 23:17:41 +02:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
RELEASE: bump to current version (0.10.2).
2012-03-26 22:47:28 +02: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 432 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%