Merge commit 'b989bb7adee0f3286dcaa63c5cd0753eac45f6be' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:05:00 +0000 (22:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:05:04 +0000 (22:05 +0100)
commitc1f9be99d73787be8a45dc68f008e2a8ad91fd42
treeca8df4835e0d0d17d4db5c70caa24175b42d2d7d
parentc388db185c8034d8cb00cb83e61dbc8d2805628f
parentb989bb7adee0f3286dcaa63c5cd0753eac45f6be
Merge commit 'b989bb7adee0f3286dcaa63c5cd0753eac45f6be' into release/0.10

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

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