Go to file
Michael Niedermayer 164899c6e8 Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'
* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:36:29 +02:00
compat
doc Merge commit '481575d255195c6c2f32e04686b94de984ae78d4' 2013-05-08 12:07:56 +02:00
libavcodec Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57' 2013-05-09 11:36:29 +02:00
libavdevice
libavfilter avfilter: fix 2 warnings about discarding const 2013-05-08 23:55:06 +02:00
libavformat Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4' 2013-05-08 13:41:45 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-08 14:32:43 +02:00
libpostproc
libswresample
libswscale libswscale: simplify isAnyRGB macro 2013-05-08 12:48:05 +00:00
presets
tests libswscale: GBRAP input & output and GBRAP16 input support 2013-05-08 12:48:05 +00:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-05-08 14:32:43 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
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.