Merge commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 23:04:20 +0000 (01:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 23:04:25 +0000 (01:04 +0200)
* commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5':
  apetag: Fix APE tag size check

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

Simple merge