Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:25:10 +0000 (12:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:25:16 +0000 (12:25 +0200)
* qatar/master:
  apetag: use int64_t for filesize

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

Simple merge