1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer c188c10805 Merge commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c'
* commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c':
  segafilm: Validate the number of audio channels

Merge only for metadata as the change is incorrect, checking audio
parameters in video only files

See: 192db16b9c202e8d037c4820b11e125d8010e7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 13:50:35 +02:00
2013-09-04 21:59:34 +02:00
2013-04-05 18:55:11 +02:00
2013-09-18 14:10:05 -04:00
2013-09-19 10:10:30 +02:00
2013-07-10 02:15:43 +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.
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%