videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
62,976 Commits 36 Branches 392 Tags 198 MiB
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 1efc089218 Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d' 
* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2014-05-05 15:03:52 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc doc/codecs: document ignore_err 2014-05-04 13:24:40 +02:00
libavcodec avcodec/lossless_videodsp: fix incompatible pointer type warning 2014-05-05 05:49:18 +02:00
libavdevice lavd/xv: reident after previous commits 2014-05-02 18:04:05 +02:00
libavfilter avfilter/f_select: fix incompatible pointer type warning 2014-05-05 05:51:50 +02:00
libavformat avisynth: set duration of audio streams 2014-05-05 04:38:33 +02:00
libavresample Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
libavutil avutil/pca: Use av_malloc_array() 2014-05-04 19:00:16 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample Fix convertion typos 2014-04-29 00:09:08 +02:00
libswscale swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array() 2014-05-04 19:49:06 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Initialize riff and wav size fields to -1 instead of 0. 2014-05-03 22:21:00 +02:00
tools lavc: add codec descriptors for TTF and OTF. 2014-04-29 13:24:18 +02:00
.gitignore examples: rename avcodec.c to decoding_encoding.c 2014-04-23 10:32:42 +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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
Changelog Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 2014-05-01 14:14:10 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Add libx265 encoder 2014-02-12 13:12:22 +00:00
MAINTAINERS MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file 2014-05-04 18:57:15 +02:00
Makefile Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 2014-03-29 14:33:39 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
common.mak lavd: Add QTKit input device. 2014-03-30 20:45:07 +02:00
configure Fix standalone compilation of sonic lossless encoder. 2014-05-05 09:14:31 +02:00
ffmpeg.c Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d' 2014-05-05 15:03:52 +02:00
ffmpeg.h Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66' 2014-05-05 14:44:33 +02:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg_filter: make *jpeg_formats static const 2014-04-28 00:22:38 +02:00
ffmpeg_opt.c Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66' 2014-05-05 14:44:33 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
ffserver.c ffserver: do not ignore lseek() return 2014-04-29 01:08:06 -04:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01: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.