Changeset 37af4871 in ffmpeg

Timestamp:

Apr 4, 2014, 10:16:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b6850e13

Parents:

490d53e3 (diff), a49aa440 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'

• commit 'a49aa440c939e221194f8d95bf98673f8cf38a06': af_volume: implement replaygain pre-amplification

Conflicts:

doc/filters.texi

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)