Go to file
Michael Niedermayer 67d1d06225 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  os_support: Add #endif comments for better readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 18:37:21 +01:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99' 2013-11-01 17:33:05 +01:00
libavcodec Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58' 2013-11-02 18:31:41 +01:00
libavdevice lavd/xv: free graphics context 2013-11-01 16:20:50 +01:00
libavfilter avfilter/vf_gradfun: add emms_c() for mmxext 2013-11-01 14:42:06 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-11-02 18:37:21 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil Merge commit '28096e0a806e57376541e6222d315619906e3c55' 2013-11-01 12:59:08 +01:00
libpostproc
libswresample lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 2013-10-17 18:09:54 +02:00
libswscale Optimize pure C unscaled yuv2rgb. 2013-10-30 20:52:24 +01:00
presets
tests FATE: Add HEVC tests 2013-10-31 20:20:16 +01:00
tools Merge remote-tracking branch 'qatar/master' 2013-10-05 11:35:39 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2013-11-02 10:38:03 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
common.mak Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050' 2013-10-04 11:49:01 +02:00
configure Merge remote-tracking branch 'qatar/master' 2013-11-02 10:38:03 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c make it possible to compile ffmpeg without swscale 2013-10-21 13:57:00 +00:00
ffmpeg.c Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53' 2013-11-01 18:22:42 +01:00
ffmpeg.h Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffplay.c ffplay: add support for libswresample options 2013-10-26 12:23:54 +02:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: add myself as libzvbi-teletextdec maintainer 2013-10-31 21:31:52 +01:00
Makefile build: Ensure that strip commands are run silently 2013-10-31 11:48:59 +01: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.