Michael Niedermayer 6b06f9f1bc Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
  af_volume: preserve frame properties

Conflicts:
	libavfilter/af_volume.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 22:13:42 +01:00
2014-02-24 11:10:23 -05:00
2012-05-04 18:40:36 +02:00
2013-12-29 22:57:20 +01:00
2014-02-24 11:09:30 -05:00
2014-02-12 13:13:17 +00:00
2012-04-06 10:23:26 +02:00
2014-02-15 16:49:04 -05: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%