No description
Find a file
Michael Niedermayer cac07d0e10 Merge commit '5fccedaa67'
* commit '5fccedaa67':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:41:41 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge commit '5fccedaa67' 2014-05-01 16:41:41 +02:00
libavcodec Merge commit '5fccedaa67' 2014-05-01 16:41:41 +02:00
libavdevice lavd/opengl_enc: fix pixel data alignment 2014-04-30 22:03:32 +02:00
libavfilter Merge commit '1c0210c798' 2014-05-01 14:14:10 +02:00
libavformat avformat/vobsub: use av_make_q(). 2014-05-01 16:18:12 +02:00
libavresample Merge commit 'a24a252709' 2014-04-25 01:19:27 +02:00
libavutil Move av_find_best_pix_fmt_of_2() from avcodec to avutil 2014-04-30 23:14:05 +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 sws: dont use the optimized 410->420 unscaled conversion when height%4 2014-04-30 06:23:39 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests matroskaenc: write CodecDelay 2014-05-01 08:03:51 +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
arch.mak Merge commit '8675bcb0ad' 2014-04-07 02:15:18 +02:00
Changelog Merge commit '1c0210c798' 2014-05-01 14:14:10 +02:00
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h Merge commit '85698be461' 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 Merge commit '1c0210c798' 2014-05-01 14:14:10 +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
ffmpeg.c ffmpeg: use av_malloc_array() 2014-05-01 02:23:08 +02:00
ffmpeg.h Merge commit '35177ba77f' 2014-04-29 01:22:22 +02:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8' 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 'a61c2115fb' 2014-04-29 01:47:53 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7' 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
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit 'b339182eba' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:12:22 +00:00
MAINTAINERS MAINTAINERS: Add myself as FIC maintainer 2014-04-21 21:27:32 -04:00
Makefile Merge commit 'a61c2115fb' 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
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.