Michael Niedermayer 60ef0c6f90 Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
  fate: correctly set sample rate for mp2 tests

Conflicts:
	tests/fate/acodec.mak
	tests/lavf-regression.sh

one hunk has been ommited as it breaks fate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 13:58:55 +02:00
2014-04-07 23:50:33 +02:00
2014-04-08 15:44:32 +02:00
2014-03-30 20:45:07 +02:00
2014-02-12 13:12:22 +00: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.
S
Description
Automated Windows Builds for FFmpeg
Readme 322 MiB
Languages
Diff 100%