Changeset 4a63c69f in ffmpeg

Timestamp:

Oct 3, 2013, 7:46:42 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5f99e6d6

Parents:

2ece7d94 (diff), 79cbac8c (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 remote-tracking branch 'qatar/master'

• qatar/master: atrac3: Generalize gain compensation code

Conflicts:

libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac3.c

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

(No files)