Go to file
Michael Niedermayer 624327988f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 04:54:26 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge remote-tracking branch 'qatar/master' 2014-04-09 04:54:26 +02:00
libavcodec Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a' 2014-04-09 04:06:35 +02:00
libavdevice pulseaudio: move NULL check up before dereference. 2014-04-06 19:38:51 +02:00
libavfilter avfilter/vf_colormatrix: fix memleak on error 2014-04-08 01:25:00 +02:00
libavformat rawvideo: Support decoding YVYU422 FourCC 2014-04-08 23:24:36 +02:00
libavresample Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' 2014-04-05 19:16:39 +02:00
libavutil Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8' 2014-04-09 03:07:47 +02:00
libpostproc Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported. 2014-03-18 23:39:30 +01:00
libswresample swresample/resample: use av_malloc_array() where appropriate 2014-04-08 00:29:26 +02:00
libswscale Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3' 2014-04-09 03:36:38 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a' 2014-04-09 04:06:35 +02:00
tools tools/uncoded_frame: fix audio codec generation 2014-03-29 09:25:14 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog libtwolame MP2 encoding support 2014-04-07 23:50:33 +02: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
cmdutils.c cmdutils: use av_mallocz_array() 2014-04-08 15:44:32 +02:00
cmdutils.h Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 2014-03-29 14:33:39 +01:00
common.mak lavd: Add QTKit input device. 2014-03-30 20:45:07 +02:00
configure configure: AVI demux needs exif 2014-04-08 20:14:49 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: frame droping due to fps should not be a warning 2014-04-04 21:15:31 +02:00
ffmpeg.h Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 2014-03-24 16:40:35 +01:00
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c ffserver: don't hardcode RTSP status codes 2014-04-07 00:24:00 -03:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:12:22 +00:00
MAINTAINERS MAINTAINER: Add CC for dshow maintainer 2014-04-03 01:41:23 +02:00
Makefile Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.