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)
* commit 'b989bb7adee0f3286dcaa63c5cd0753eac45f6be':
  apetag: Fix APE tag size check

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

Simple merge