Michael Niedermayer 4a63c69faa 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>

2013-10-03 21:46:42 +02:00

4.9 KiB

Raw Blame History

View Raw