generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,051 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
34b78ad04f
Go to file
Michael Niedermayer 34b78ad04f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: Move some ifdefs to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 23:38:41 +02:00
compat Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/. 2013-03-21 04:23:24 +01:00
doc doc/utils: use @code markup for opencl function names. 2013-04-12 23:10:59 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-04-12 23:38:41 +02:00
libavdevice avdevice/lavfi: add error checking for av_opt_set_int_list() 2013-04-12 20:39:07 +02:00
libavfilter lavfi/hue: add support for more alpha formats 2013-04-12 19:46:19 +00:00
libavformat Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795' 2013-04-11 21:50:53 +02:00
libavresample Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
libavutil lavu: add helper functions for integer lists. 2013-04-12 12:09:51 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
libswscale Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests vf_interlace: fix frame rate 2013-04-12 16:40:35 +02:00
tools Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2013-04-12 16:32:33 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9' 2013-04-12 16:16:21 +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 remote-tracking branch 'qatar/master' 2013-04-12 16:32:33 +02:00
COPYING.GPLv2
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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb' 2013-04-12 15:19:32 +02:00
ffmpeg_opt.c Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0' 2013-04-12 15:33:37 +02:00
ffmpeg.c Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +02:00
ffmpeg.h Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
ffplay.c ffplay: replace opaque/params for buffersinks 2013-04-12 20:39:07 +02:00
ffprobe.c ffprobe: set writer context to 0 after allocation 2013-03-19 18:00:34 +01:00
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE LICENSE: add libutvideo in the GPL libraries list. 2013-03-29 02:08:20 +01:00
MAINTAINERS MAINTAINERS: add opencl maintainer 2013-04-11 13:42:07 +02:00
Makefile Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02: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.