Michael Niedermayer 8c0a14d221 Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'
These patches have not been merged at the request of Carl

* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
  build: Drop AVX assembly ifdefs
  x86: Require an assembler able to cope with AVX instructions

Conflicts:
	libavcodec/x86/fft.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 12:18:26 +01:00
2012-10-13 21:17:43 +02:00
2012-05-04 18:40:36 +02:00
2012-11-11 23:12:54 +01:00
2012-11-04 13:00:20 +01:00
2011-04-08 02:50:13 +02:00
2012-11-11 23:12:54 +01:00
2012-11-06 01:46:21 +01:00
2012-04-06 10:23:26 +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.
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%