No description
Find a file
Michael Niedermayer 9d01bf7d66 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Consistently use "cpu_flags" as variable/parameter name for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideo.c
	libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 09:53:47 +02:00
compat
doc doc/filters: update/correct mp documentation 2013-07-17 09:34:05 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavdevice avdevice/lavfi: fix input with unknown channel layout 2013-07-13 23:10:05 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavformat Merge https://github.com/lukaszmluki/ffmpeg 2013-07-18 01:40:49 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libpostproc
libswresample
libswscale swscale/options: fix copy and paste typo 2013-07-17 16:59:29 +02:00
presets
tests lavf/matroskaenc: Check for valid metadata before creating tags 2013-07-17 12:18:27 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
arch.mak
Changelog lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
cmdutils_common_opts.h
common.mak
configure lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c ffmpeg_opt: do not warn about unused gop_timecode 2013-07-09 10:54:40 +02:00
ffplay.c ffplay: remove explicit idct option 2013-07-13 15:01:05 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: drop 1.1 from the releases that i maintain 2013-07-15 02:30:36 +02:00
Makefile
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +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.