OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 12:42:56 +0000 (13:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 12:43:01 +0000 (13:43 +0100)
commit2265bb93ffc4b491fefb491c04f919441be0c952
tree21de499c5e2fcb94786cf461ab5aca76d8323e55
parent5be70f58260efc9f4718fe5dd842d20b9eca391c
parentc42e2625130204733916e6ffb1a86ccdffe5fe71
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  add support for Monkey's Audio versions from 3.93

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/apedec.c
libavformat/ape.c