1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer cf4515ecd9 Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
  fate: Use wmv2 IDCT for wmv2 tests
  vorbisdsp: change block_size type from int to intptr_t.

Conflicts:
	tests/fate-run.sh
	tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 16:28:04 +01:00
compat
doc afade filter 2013-01-21 15:20:42 +00:00
libavcodec Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3' 2013-01-21 16:28:04 +01:00
libavdevice Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libavfilter afade filter 2013-01-21 15:20:42 +00:00
libavformat Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382' 2013-01-21 15:18:57 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-01-19 13:20:25 +01:00
libpostproc
libswresample swr: support first_pts 2013-01-21 00:52:14 +01:00
libswscale sws: check that dither array is not null before memset 2013-01-19 23:38:17 +01:00
presets
tests Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3' 2013-01-21 16:28:04 +01:00
tools tools: add plotframes script 2013-01-15 22:50:19 +01:00
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak
Changelog afade filter 2013-01-21 15:20:42 +00:00
cmdutils_common_opts.h
cmdutils.c cmdline: fix -- to escape files starting with - 2013-01-19 14:50:36 +01:00
cmdutils.h
common.mak
configure configure: Fix Barcelona and Bulldozer compiler options with suncc 2013-01-19 14:38:39 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d' 2013-01-15 15:32:48 +01:00
ffmpeg.c Merge commit 'd9bf716945046333c24580d538f450b516f15710' 2013-01-21 14:10:32 +01:00
ffmpeg.h
ffplay.c ffplay: flush video filters on seek 2013-01-19 00:48:06 +01:00
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.