Michael Niedermayer 4e6f1df657 Merge commit '0ad8d751337efbbd61c0d78762448b043100b653' into release/2.2
* commit '0ad8d751337efbbd61c0d78762448b043100b653':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
	configure

See: f514b5dff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09 12:49:05 +01:00
2015-02-17 19:50:54 +01:00
2015-03-08 11:20:46 -04:00
2013-12-29 22:57:20 +01:00
2014-03-01 03:34:59 +01:00
2015-03-08 11:16:33 -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.
S
Description
No description provided
Readme 299 MiB
Languages
C 89.1%
Assembly 8.4%
Makefile 1.4%
GLSL 0.3%
C++ 0.3%
Other 0.2%