OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 19:46:42 +0000 (21:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 19:46:42 +0000 (21:46 +0200)
commit4a63c69faac6fca4eea6fc4e8466ebdc8c4575c5
tree93e2a4a8b3f3af332e04fd09157e394832f210b7
parent2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7
parent79cbac8cd456c3f1c914bd1e7262b55e48de13a7
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>
libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac3.c