1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Michael Niedermayer 6d1e9d993a Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:52:21 +01:00
compat
doc Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
libavcodec Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836' 2013-01-23 17:52:21 +01:00
libavdevice
libavfilter Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
libavformat rtmp: fix buffer overflows in ff_amf_tag_contents() 2013-01-23 05:29:59 +01:00
libavresample
libavutil Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9' 2013-01-23 14:31:55 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6' 2013-01-22 14:09:59 +01:00
tools Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
.gitignore
arch.mak
Changelog afade filter 2013-01-21 15:20:42 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure libm: Add fallback definition for cbrt() using pow() 2013-01-22 16:02:31 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit 'd9bf716945046333c24580d538f450b516f15710' 2013-01-21 14:10:32 +01:00
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.