Michael Niedermayer 16bb8faac6 Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'
* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
  atrac: Move doxygen comments to the header

Conflicts:
	libavcodec/atrac.c
	libavcodec/atrac.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:22:55 +02:00
2013-10-02 21:03:15 -04:00
2013-09-24 16:29:18 +02:00
2013-10-02 21:03:11 -04:00
2013-04-05 18:55:11 +02:00
2013-10-02 12:59:39 +02:00
2013-09-21 16:35:41 +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 89.7%
Assembly 8.2%
Makefile 1.3%
C++ 0.3%
Objective-C 0.1%
Other 0.1%