FFmpeg git repo
Go to file
Michael Niedermayer 5717562c78 Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
	configure
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 13:57:10 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
doc examples: add README file with simple compilation instructions 2012-10-16 13:34:48 +02:00
libavcodec Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
libavdevice caca: fix 10l typo 2012-10-12 19:05:58 +02:00
libavfilter mandelbrot: fix inner=period coloring routine 2012-10-16 04:00:55 +02:00
libavformat Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7' 2012-10-16 13:20:46 +02:00
libavresample Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
libavutil Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swr/rematrix: fix C99 left shift overflow 2012-10-14 03:48:05 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-10-15 14:09:35 +02:00
presets
tests msvideo1enc: fix interframe encoding 2012-10-16 02:22:27 +02:00
tools tools/ffeval: do not use UNIX-specific /dev/std{in,out} files 2012-10-16 13:51:44 +02:00
.gitignore gitignore: add *.dylib for those of us on Darwin/OS X systems. 2012-10-16 04:14:09 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog lavc: add xface image decoder and encoder 2012-10-15 08:32:18 +02:00
cmdutils_common_opts.h
cmdutils.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
cmdutils.h
common.mak
configure Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams 2012-10-16 01:04:42 +02:00
ffmpeg_opt.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg.h Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffplay.c ffplay: Prevent 0/0 aspect from being passed on to lavfi 2012-10-14 23:40:14 +02:00
ffprobe.c
ffserver.c ffserver: fix return value of add_codec() 2012-10-13 05:36:41 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile examples: add README file with simple compilation instructions 2012-10-16 13:34:48 +02:00
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.