1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Go to file
Michael Niedermayer 309171bea9 Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'
* commit '3407172b36a93cec410c6a287dbeec0f41257512':
  avienc: K&R formatting cosmetics

Conflicts:
	libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04 22:21:58 +01:00
compat
doc lavd/avdevice: add device iterators 2014-03-03 23:39:07 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-03-04 15:09:58 +01:00
libavdevice lavd/avdevice: add device iterators 2014-03-03 23:39:07 +01:00
libavfilter vf_frei0r: fix missing end of line character 2014-03-04 18:27:09 +01:00
libavformat Merge commit '3407172b36a93cec410c6a287dbeec0f41257512' 2014-03-04 22:21:58 +01:00
libavresample
libavutil Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54' 2014-03-04 21:55:16 +01:00
libpostproc
libswresample
libswscale
presets
tests
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore
arch.mak
Changelog update for 2.2 2014-03-01 03:34:59 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure vf_frei0r: refactor library loading from env variable 2014-03-04 11:39:02 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01: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.