Michael Niedermayer 198ea7a96f Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'
* commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d':
  pnm: add high-bitdepth PGMYUV support for both encoder and decoder

Conflicts:
	libavcodec/pnm.c
	libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 14:14:28 +01:00
2013-02-18 00:53:17 +01:00
2013-02-24 13:12:46 +01:00
2013-02-24 13:12:46 +01:00
2013-02-21 20:16:23 +00:00
2013-01-11 10:07:52 +00:00
2013-02-16 11:42:41 +00:00
2013-01-06 21:42:35 +01:00
2013-01-06 21:42:35 +01: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%