1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer b394b9013e Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'
* commit '58bc38a5f224d29b79338200459792c765c25fd5':
  tiffdec: use correct data type for palette entries and set alpha to 0xFF

Conflicts:
	libavcodec/tiff.c

See: dbfdb288c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 02:01:31 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71' 2014-04-13 00:37:32 +02:00
libavcodec Merge commit 'bf2064f046af64c59a416c814474a39b0a457569' 2014-04-13 01:49:19 +02:00
libavdevice lavd/qtkit: add device category 2014-04-12 19:50:09 +02:00
libavfilter avfilter/settb: remove duplicate #include 2014-04-10 21:58:03 +02:00
libavformat Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03' 2014-04-12 21:26:20 +02:00
libavresample Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83' 2014-04-11 20:39:04 +02:00
libavutil avutil/log: add av_log_get_flags() 2014-04-12 20:25:10 +02:00
libpostproc Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported. 2014-03-18 23:39:30 +01:00
libswresample swresample/resample: use av_malloc_array() where appropriate 2014-04-08 00:29:26 +02:00
libswscale Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad' 2014-04-13 01:26:49 +02:00
presets
tests swscale: Set alpha to opaque for internal palettes. 2014-04-12 14:07:19 -04:00
tools tools/uncoded_frame: fix audio codec generation 2014-03-29 09:25:14 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Add AVFoundation input device. 2014-04-11 17:51:33 +02:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.c cmdutils: use av_mallocz_array() 2014-04-08 15:44:32 +02: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 Add AVFoundation input device. 2014-04-11 17:51:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: stop protocols on interrupt when no transcoding has happened yet 2014-04-10 22:29:23 +02:00
ffmpeg.h Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 2014-03-24 16:40:35 +01:00
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c ffserver: don't hardcode RTSP status codes 2014-04-07 00:24:00 -03:00
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:12:22 +00:00
MAINTAINERS Add AVFoundation input device. 2014-04-11 17:51:33 +02:00
Makefile Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01: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.