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)
* qatar/master:
  add support for Monkey's Audio versions from 3.93

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

Simple merge
Simple merge