Michael Niedermayer 0be41c6586 Merge commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc' into release/0.10
* commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc':
  movdec: handle 0x7fff langcode as macintosh per the specs
  avi: Improve non-interleaved detection

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 02:34:10 +02:00
2014-06-03 01:03:53 +02:00
2012-10-25 21:19:56 +02:00
2011-06-12 18:01:29 +02:00
2013-01-03 15:20:12 +01:00
2014-03-13 20:59:00 -04:00
2014-03-10 19:00:59 +01:00
2011-04-08 02:50:13 +02:00
2011-09-26 02:28:21 +02:00
2014-03-10 19:00:59 +01:00
2014-03-10 19:00:59 +01:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.
Languages
C 90.9%
Assembly 7.2%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%