Michael Niedermayer 66df6f5407 Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
  lavc: deprecate AVCodecContext.debug_mv

Conflicts:
	libavcodec/options_table.h

Not merged, debug_mv works fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:36:46 +01:00
2013-10-31 20:20:16 +01:00
2013-10-31 20:19:59 +01:00
2013-10-29 14:00:29 +00: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%