Go to file
Michael Niedermayer 1abb875c98 Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'
* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
	libavcodec/jpeg2000.c

See: 9d56ccf5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-03 16:11:01 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 2013-07-03 13:21:42 +02:00
libavcodec Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788' 2013-07-03 16:11:01 +02:00
libavdevice lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 2013-07-03 13:21:42 +02:00
libavfilter lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 2013-07-03 13:21:42 +02:00
libavformat avformat/matroskaenc: Allow VP9 and Opus in webm 2013-07-03 00:10:50 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi 2013-07-03 13:16:33 +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 cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
libswscale swscale: Fix PAL8 input with alpha 2013-06-26 15:14:00 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests oggdec: do not fall back on binary search in the generic code. 2013-07-02 10:37:22 +02:00
tools tools/qt-faststart: Fix unintended sign extension of current_offset 2013-06-02 23:10:44 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavf: add support for libgme 2013-07-02 18:52:45 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: dont change the log level for -report 2013-06-24 02:59:05 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi 2013-07-03 13:16:33 +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_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.c ffmpeg: Don't include colorspace.h 2013-06-29 16:44:12 -04:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 2013-07-03 13:21:42 +02:00
ffprobe.c ffprobe: always exit 1 in case of errors 2013-06-27 00:20:36 +02:00
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS MAINTAINERS: add address to contact "AvxSynth Team" 2013-07-03 02:26:13 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02: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.