Michael Niedermayer 490ed7f0ec Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'
* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
  wmapro: check the min_samples_per_subframe

Conflicts:
	libavcodec/wmaprodec.c

See: 9166f483c52e7e0a031a7bb149bea16aaa72f344

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 13:21:49 +02:00
2012-05-04 18:40:36 +02:00
2013-06-14 01:27:22 +02:00
2013-06-29 16:44:12 -04:00
2013-06-14 01:27:22 +02:00
2012-04-06 10:23:26 +02:00
2013-01-06 21:42:35 +01: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
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%