FFmpeg git repo
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
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
libswresample
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
.gitignore
arch.mak
Changelog Add AVFoundation input device. 2014-04-11 17:51:33 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
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
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: stop protocols on interrupt when no transcoding has happened yet 2014-04-10 22:29:23 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS Add AVFoundation input device. 2014-04-11 17:51:33 +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.