1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Michael Niedermayer c2df95978b Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'
* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
  atrac3: Replace a silly counter variable name with plain 'j'

Conflicts:
	libavcodec/atrac3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:14:54 +02:00
2013-10-02 21:03:15 -04:00
2012-05-04 18:40:36 +02: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
2011-04-08 02:50:13 +02:00
2013-09-21 16:35:41 +02:00
2012-04-06 10:23:26 +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.1%
Other 0.1%