virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
53,229 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
74cb7ef851
Go to file
Michael Niedermayer 74cb7ef851 Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0' 
* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
  lavfi: rename AVFilterFormats.format_count to nb_formats

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/filtfmts.c
	libavfilter/formats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:46:09 +02:00
compat
doc Merge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae' 2013-05-18 11:35:51 +02:00
libavcodec Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavdevice Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 2013-05-16 09:56:43 +02:00
libavfilter Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0' 2013-05-18 11:46:09 +02:00
libavformat avidec: dont randomly skip packets for offseting the index 2013-05-17 22:16:10 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2' 2013-05-18 11:17:52 +02:00
libpostproc
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input 2013-05-18 01:20:30 +02:00
presets
tests sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input 2013-05-18 01:20:30 +02:00
tools tools/ffhash: Use O_BINARY when available 2013-05-17 00:38:07 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak
Changelog Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak
configure Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.c ffmpeg: free threads on error conditions. 2013-05-15 01:28:59 +02:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
MAINTAINERS lavfi: factorize drawgrid and drawbox code 2013-05-17 00:46:32 +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.