Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Feb 2012 02:02:23 +0000 (03:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Feb 2012 02:02:34 +0000 (03:02 +0100)
* qatar/master:
  ape: fix seeking
  apedec: 8bit and 24bit support

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

Simple merge
Simple merge