* qatar/master: ATRAC3+ decoder Conflicts: Changelog configure libavcodec/atrac3plus.c libavcodec/atrac3plus.h libavcodec/atrac3plus_data.h libavcodec/atrac3plusdec.c libavcodec/atrac3plusdsp.c libavcodec/version.h See: 2e1fb96af3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2e1fb96af3
Cleanup by Diego Biurrun. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Cleanup by Diego Biurrun. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>