Go to file
Michael Niedermayer e222cfefcd Merge commit '4d8c28deab2488579f585406110b1be790896e59'
* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
	libavutil/imgutils.c

See: 4d8c28deab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:27:35 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc doc/ffmpeg: note that -t is also an input option 2014-05-26 12:11:34 -08:00
libavcodec avcodec/g723_1: fix writing into input frame data and warning 2014-05-26 21:05:03 +02:00
libavdevice avdevice/v4l2: Use av_malloc_array() 2014-05-22 15:08:12 +02:00
libavfilter Add metadata injection to blackdetect 2014-05-24 03:56:42 +02:00
libavformat avformat/utils: set max analyze duration depending on the circumstances 2014-05-26 22:33:01 +02:00
libavresample Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavutil Merge commit '4d8c28deab2488579f585406110b1be790896e59' 2014-05-27 02:27:35 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample: add swri_resample_float_avx 2014-05-16 05:27:03 +02:00
libswscale sws: document color range >8bit oddity 2014-05-21 21:29:33 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests avcodec/webvttenc: add webvtt encoder 2014-05-25 03:04:14 +02:00
tools tools: Use av_gettime_relative() 2014-05-17 15:51:58 +02:00
.gitignore gitignore: add tools/uncoded_frame 2014-05-06 14:14:32 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog avcodec/webvttenc: add webvtt encoder 2014-05-25 03:04:14 +02:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32 2014-05-17 13:18:29 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure configure: s/solving/solve 2014-05-26 11:54:35 -08: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_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c Merge commit '9580818c5d934bde65a95efd2cee61c174721092' 2014-05-05 15:51:55 +02:00
ffmpeg_opt.c ffmpeg: use av_stream_get_end_pts() 2014-05-21 18:53:42 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: use thread message API. 2014-05-26 11:40:21 +02:00
ffmpeg.h ffmpeg: use thread message API. 2014-05-26 11:40:21 +02:00
ffplay.c ffplay: support rotated video. 2014-05-23 23:30:21 +02:00
ffprobe.c ffprobe: Use av_malloc_array() 2014-05-21 15:59:22 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04: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:13:17 +00:00
MAINTAINERS MAINTAINERS: add Trac maintainers 2014-05-26 12:18:29 -08:00
Makefile Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f' 2014-05-15 21:01:07 +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.