No description
Find a file
Michael Niedermayer 7163bbefa2 Merge commit 'e1f3847f86'
* commit 'e1f3847f86':
  mace: Make sure that the channel count is set to a valid value

Conflicts:
	libavcodec/mace.c

See: 6df1cfa7e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 15:16:01 +02:00
compat Merge commit 'ef51692a49' 2013-08-28 12:46:12 +02:00
doc doc/fftools-common-opts: document -help long and full output 2013-09-17 12:30:40 +02:00
libavcodec Merge commit 'e1f3847f86' 2013-09-17 15:16:01 +02:00
libavdevice lavd/v4l2: Improve debug message 2013-09-08 14:30:52 +02:00
libavfilter avfilter: add adelay filter 2013-09-16 14:33:07 +00:00
libavformat avformat/utils: Print warning if reallocating probe buffer failed 2013-09-17 13:09:24 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil Merge commit '3feb3d6ce4' 2013-09-17 11:06:26 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swresample: replace 2 av_free() by av_freep() 2013-09-16 22:44:15 +02:00
libswscale swscale/yuv2rgb: make sure yuvTable is set to NULL after deallocation 2013-09-16 22:47:21 +02:00
presets
tests matroskaenc: Bump DocTypeVersion to 4 2013-09-15 02:08:15 +02:00
tools tools/crypto_bench: fix 2 typos. 2013-09-04 21:59:34 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak
Changelog avfilter: add adelay filter 2013-09-16 14:33:07 +00:00
cmdutils.c cmdutils: silence warning about incompatible pointer types 2013-08-30 12:41:36 +00:00
cmdutils.h Merge commit '636ced8e1d' 2013-07-08 04:34:11 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
configure Merge commit '187105ff8a' 2013-09-17 10:53:14 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend" 2013-09-10 14:13:44 +02:00
ffmpeg.h Merge commit '488a0fa689' 2013-08-06 12:41:04 +02:00
ffmpeg_filter.c ffmpeg_filter: check that the input media type match the filter 2013-08-14 03:03:41 +02:00
ffmpeg_opt.c Merge commit '488a0fa689' 2013-08-06 12:41:04 +02:00
ffplay.c ffplay: make next_nb_channels[] static const 2013-08-24 19:53:11 +02:00
ffprobe.c ffprobe: show bitmap subtitles size. 2013-09-04 16:36:28 +02:00
ffserver.c ffserver: allow choosing the pixel format 2013-09-14 03:51:45 +02:00
INSTALL
library.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
LICENSE lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
MAINTAINERS MAINTAINERS: move sections from lavc to lavu 2013-09-12 15:17:11 +02:00
Makefile Merge commit '90f9a5830b' 2013-05-24 13:01:41 +02:00
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
version.sh

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.