Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:56:49 +0000 (20:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:58:03 +0000 (20:58 +0100)
commit268d93172460f116d239c2cf815d7b2f495efb2d
tree6648863bf756cd7820d36f61d03d24d7bf7f64af
parent92b2404571bcdd294d6ef0e614eee55432e959a7
parente6f0bb65270be51ea43345a28f8e4b1a728f7d0e
Merge remote-tracking branch 'qatar/master'

* 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: 2e1fb96af36348479e14aa85f445915ea09e70fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/atrac3plus.c
libavcodec/atrac3plus.h
libavcodec/atrac3plusdec.c
libavcodec/atrac3plusdsp.c
libavcodec/version.h