1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 23290c86bf Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog

See: 0b1f20e23c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:03:31 +02:00
compat
doc OpenEXR decoder 2014-04-01 01:13:09 +02:00
libavcodec Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845' 2014-04-01 03:55:45 +02:00
libavdevice dshow: fixup some COM objects, based on patches from Don Moir 2014-03-31 23:11:35 +02:00
libavfilter avfilter/vf_pullup: fix gray8 2014-03-31 03:22:20 +02:00
libavformat OpenEXR decoder 2014-04-01 01:13:09 +02:00
libavresample Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 2014-03-26 14:50:55 +01:00
libavutil avutil/opt: dont crash on av_opt_set_dict() with NULL 2014-03-30 15:00:03 +02:00
libpostproc
libswresample
libswscale Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 2014-03-26 14:50:55 +01:00
presets
tests fate: add exr tests 2014-04-01 01:13:17 +02:00
tools tools/uncoded_frame: fix audio codec generation 2014-03-29 09:25:14 +01:00
.gitignore
arch.mak
Changelog Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f' 2014-04-01 04:03:31 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE 2014-03-28 17:29:26 +01:00
cmdutils.h Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 2014-03-29 14:33:39 +01:00
common.mak lavd: Add QTKit input device. 2014-03-30 20:45:07 +02:00
configure OpenEXR decoder 2014-04-01 01:13:09 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc' 2014-03-25 19:25:10 +01:00
ffmpeg.h Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 2014-03-24 16:40:35 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS lavd: Add QTKit input device. 2014-03-30 20:45:07 +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.