1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Michael Niedermayer 5c43f3ddea Merge commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31'
* commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31':
  vmd: decode videos with no LZ buffer size provided - they might not need it

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 12:33:00 +02:00
2013-06-02 15:16:52 +00:00
2013-05-30 10:44:54 +02:00
2013-06-02 11:27:19 +02:00
2013-06-02 15:16:52 +00:00
2013-06-02 15:16:52 +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.
Languages
C 89.3%
Assembly 8.3%
Makefile 1.4%
C++ 0.3%
GLSL 0.3%
Other 0.2%