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)
* qatar/master:
  ape: adjust some printf format strings to correctly match argument types

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

Simple merge