Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Jul 2011 13:37:11 +0000 (15:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Jul 2011 13:37:22 +0000 (15:37 +0200)
commit788d8399385361a88e5d7bd4377cf38fb1488544
treeb2cc124cf4e6bae5b81ee5dbd8f1199d24e043ee
parent2962049ac318c1577c15e934a50b64572b2e877c
parentab3d241be17ac376f0dfdbbce0e4ce2c319c6eea
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ape: adjust some printf format strings to correctly match argument types

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