1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Michael Niedermayer e4fc7e3d4d Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
	libavcodec/libmp3lame.c

See: 07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 02:18:24 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-01 17:09:12 +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.
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%