1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 8c320b3c08 Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'
* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
  dcadec: Validate the lfe parameter

Conflicts:
	libavcodec/dcadec.c

See: 3b2cd83a82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 15:37:55 +02:00
compat
doc
libavcodec Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e' 2013-09-20 15:37:55 +02:00
libavdevice
libavfilter
libavformat Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4' 2013-09-20 15:30:51 +02:00
libavresample
libavutil avutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning 2013-09-19 22:46:52 +02:00
libpostproc
libswresample
libswscale swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1 2013-09-19 23:15:51 +02:00
presets
tests
tools
.gitignore
arch.mak
Changelog Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5' 2013-09-20 12:06:15 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'e5d45e028cf4193b562075897e55091779e49f15' 2013-09-20 15:23:58 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.