Merge commit '56ac2cbd0464e0146e62c91843e2b1f5e0908504' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:07:07 +0000 (04:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:07:26 +0000 (04:07 +0100)
* commit '56ac2cbd0464e0146e62c91843e2b1f5e0908504':
  apetag: Fix APE tag size check

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

Simple merge