1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to 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
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
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
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.