Michael Niedermayer 8c51ea5489 Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'
* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83':
  matroskadec: split frame parsing
  matroskadec: split laces parsing

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20 20:39:47 +02:00
2012-09-19 11:50:09 +02:00
2012-09-20 12:13:18 +02:00
2012-09-15 15:40:36 -04:00
2012-09-07 14:59:01 +02:00
2012-09-18 23:27:43 -05:00
2012-09-19 11:50:05 +02:00
2012-09-18 21:11:06 -05:00
2012-08-31 00:24:11 +02: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
Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
Readme 298 MiB
Languages
C 91.6%
Assembly 6.5%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%