Michael Niedermayer 76d7676fcc Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'
* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
	libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:52:19 +01:00
2014-03-13 11:59:34 +01:00
2013-12-29 22:57:20 +01:00
2014-02-12 13:12:22 +00:00
2014-03-13 08:24:11 -04:00

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.
Description
FFmpeg with added filter to color correct dive videos
Readme 432 MiB
Languages
C 90.6%
Assembly 7.5%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%