virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
52,613 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
3319679d0a
Go to file
Michael Niedermayer 3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +02:00
compat
doc Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
libavcodec Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633' 2013-05-01 10:00:08 +02:00
libavdevice
libavfilter Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
libavformat framecrcenc: workaround design flaw in sidedata palette 2013-04-30 13:35:14 +02:00
libavresample
libavutil avutil/log: Fix context pointer used for get_category() 2013-04-30 20:06:24 +02:00
libpostproc
libswresample
libswscale sws: fix typo in xyz2rgb matrix use. 2013-04-28 19:57:45 +02:00
presets
tests Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
tools ismindex: check mkdir()s return code 2013-04-21 19:53:18 +02:00
.gitignore
arch.mak
Changelog Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
cmdutils_common_opts.h
cmdutils.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
cmdutils.h
common.mak
configure lavu/opencl: add check version and platform 2013-04-28 23:42:58 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: fix leak on error 2013-04-21 11:59:34 +02:00
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE lavfi: add video stabilization plugins using vid.stab library 2013-04-24 18:30:42 +02:00
MAINTAINERS MAINTAINERS: add jpeg2000 maintainer 2013-04-24 16:42:47 +02:00
Makefile
README
RELEASE
version.sh

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.