Michael Niedermayer 516ba41f05 Merge commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b' into release/2.2
* commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b':
  avconv: fix the muxrate values for -target

Conflicts:
	ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-20 14:28:57 +02:00
2014-08-11 20:16:12 +02:00
2014-08-05 04:14:02 +02:00
2012-05-04 18:40:36 +02:00
2014-08-17 10:23:20 -04:00
2013-12-29 22:57:20 +01:00
2011-04-08 02:50:13 +02:00
2014-02-12 13:12:22 +00:00
2014-03-01 03:34:59 +01:00
2012-04-06 10:23:26 +02:00
2014-08-17 10:20:00 -04: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%