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)
commitbfb5ba8495e19f6078bb5bd42ea5793355da5e28
tree0952604dcac1373eb654a83c6cb0dea251d5ee4d
parent7e850f1cd053066bf06e772ca79ad95c99d9b6b3
parent86b57e4efea649246d882fcfdfa02e148a736496
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ape: fix seeking
  apedec: 8bit and 24bit support

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