FFmpeg git repo
Go to file
Michael Niedermayer 9766d9c985 Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
  x86: yasm: Use complete source path for macro helper %includes

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:57:09 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc lavfi/drawbox: implement color=invert mode 2012-10-31 12:14:21 +01:00
libavcodec Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
libavdevice x11grab: fix mixed declaration and code 2012-10-29 22:24:10 +01:00
libavfilter Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
libavformat wavenc: fix curruption of metadata 2012-10-30 21:48:39 +01:00
libavresample Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
libavutil x86: Fix assembly with NASM 2012-10-31 13:50:01 +01:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
libswscale Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests lavfi: add field filter 2012-10-31 12:07:11 +01:00
tools probetest: fix possible use of uninitialized data 2012-10-31 13:16:52 +01:00
.gitignore tools: add ffescape utility 2012-10-25 23:56:16 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog lavfi: add field filter 2012-10-31 12:07:11 +01:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
common.mak Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
configure configure: fix print_config() with broke awks 2012-10-30 19:26:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: fix negative array index 2012-10-22 13:58:19 +02:00
ffmpeg_opt.c ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffmpeg.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffplay.c ffplay: if there is no audio stream, use external clock by default 2012-10-21 17:18:12 +02:00
ffprobe.c ffprobe: add an array of section print buffers to the WriterContext 2012-10-24 23:40:21 +02:00
ffserver.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
INSTALL
library.mak Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 2012-10-24 12:53:26 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Change my GPG fingerprint 2012-10-30 18:51:21 +01:00
Makefile x86: yasm: Use complete source path for macro helper %includes 2012-10-31 00:37:42 +01:00
README
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +02:00
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.