Michael Niedermayer fb17f03dad Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'
* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04 02:56:29 +01:00
2013-12-30 04:05:27 +01:00
2013-12-29 22:57:20 +01:00
2013-12-29 22:57:20 +01:00
2013-11-29 16:41:42 +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%