Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:41:46 +0000 (21:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:43:28 +0000 (21:43 +0100)
commit2870b86c2a9fac3a52b82604e4b8aaf7360da04e
tree238857420e013b1ba6ea34ad0fda43404c620418
parentfa321cc0c8edabc790bcea41ceeecb226ed8d5a5
parente1a57cbb1c2752feb9315f748836dc44e58d2dc6
Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
  ape: Use the proper variable type

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