virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
52,703 Commits 37 Branches 400 Tags 467 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
22dc25cb29
Go to file
Michael Niedermayer 22dc25cb29 Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe' 
* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
  avconv: improve -re implementation

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:53:08 +02:00
compat
doc Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521' 2013-05-03 13:16:34 +02:00
libavcodec Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a' 2013-05-03 13:03:00 +02:00
libavdevice avdevice/lavfi: add error checking for av_opt_set_int_list() 2013-04-12 20:39:07 +02:00
libavfilter lavfi/blend: merge config_input_top into config_output 2013-05-02 12:22:18 +00:00
libavformat Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521' 2013-05-03 13:16:34 +02:00
libavresample
libavutil Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f' 2013-05-03 11:57:59 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d' 2013-05-01 18:21:35 +02:00
presets
tests Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44' 2013-05-03 11:41:48 +02:00
tools ismindex: check mkdir()s return code 2013-04-21 19:53:18 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak
Changelog Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521' 2013-05-03 13:16:34 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure Merge commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb' 2013-05-03 11:17:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
ffmpeg_opt.c Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117' 2013-05-01 12:09:07 +02:00
ffmpeg.c Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe' 2013-05-03 13:53:08 +02:00
ffmpeg.h Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
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 Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
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.