1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Michael Niedermayer 738272826f Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
  build: Add missing object files for Matroska demuxer

Conflicts:
	libavcodec/Makefile
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:19:41 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. 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%