Michael Niedermayer 8364bde02b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
	libavcodec/sipr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22 14:04:44 +02:00
2012-09-22 09:34:56 +02:00
2012-05-04 18:40:36 +02:00
2012-09-15 15:40:36 -04:00
2012-09-07 14:59:01 +02:00
2012-09-21 15:14:11 +02:00
2012-09-18 23:27:43 -05:00
2012-09-21 15:14:11 +02:00
2012-09-18 21:11:06 -05:00
2012-08-31 00:24:11 +02: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 209 MiB
Languages
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%