Michael Niedermayer 1946ad4d8c Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'
* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
  isom: add some BOXX tags
  isom: add 'flic' tag
  isom: add 'm1v ' tag

Conflicts:
	libavformat/isom.c

See: ca8623e1a537fa48366efebdf235442f1197bb71
See: 8a3f976498cc096644b95ade7240a73e17d3a042
See: fca62f05005567514b5daaea230ba9365e202201
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 02:44:56 +02:00
2014-04-03 23:43:47 +02:00
2012-05-04 18:40:36 +02:00
2014-04-02 19:44:08 +02:00
2014-04-03 00:41:45 +02:00
2014-03-30 20:45:07 +02:00
2011-04-08 02:50:13 +02:00
2014-02-12 13:12:22 +00:00
2012-04-06 10:23:26 +02:00
2014-03-13 08:24:11 -04: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%