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)
commitab02548c8a71adc8f049b7630ca7602dc85be062
treed758f9677c3ded6ff545e236411bdc1f3e4af28d
parentcc73b4f574b6c99066a0482bdfc20e6da1f400a7
parentb45ab61b24a8f2aeafdd4451491b1b30b7875ee5
Merge commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5' into release/2.4

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

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