Merge commit 'c5560e72d0bb69f8a1ac9536570398f84388f396'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 18:38:56 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 18:42:26 +0000 (20:42 +0200)
commit8c71de762b84df7520f04818f98d6d70dbb063f2
tree744bd3f14c373fb3c7a5a07b612ada52a0309bd9
parent43633c5388d3237a492ba9614fc276c283c4e21a
parentc5560e72d0bb69f8a1ac9536570398f84388f396
Merge commit 'c5560e72d0bb69f8a1ac9536570398f84388f396'

* commit 'c5560e72d0bb69f8a1ac9536570398f84388f396':
  apetag: Fix APE tag size check

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