1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer ac3ca3d311 Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
* commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
  jpeg2000: Propagate error code from get_cox()
  jpeg2000: Check that nreslevels2decode has been initialized before use

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-03 14:50:51 +02:00
compat
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 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f' 2013-07-03 14:50:51 +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
libavutil configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi 2013-07-03 13:16:33 +02:00
libpostproc
libswresample
libswscale
presets
tests oggdec: do not fall back on binary search in the generic code. 2013-07-02 10:37:22 +02:00
tools
.gitignore
arch.mak
Changelog lavf: add support for libgme 2013-07-02 18:52:45 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi 2013-07-03 13:16:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
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
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add address to contact "AvxSynth Team" 2013-07-03 02:26:13 +02:00
Makefile
README
RELEASE
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.