Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 19:41:31 +0000 (21:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 19:42:08 +0000 (21:42 +0200)
commit918c5ea4d3702a9eebf4794e75507c4d5bc9cba2
tree9f918bbecd27065dc63da9634c7ae122e4e98556
parent004564c930ef60d2f9e8798e820ed7b2a37ba0bd
parent295e05a762332c5edcc84c325e94457815a51b5c
Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'

* commit '295e05a762332c5edcc84c325e94457815a51b5c':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
libavcodec/apedec.c

See: 699341d647f7af785fb8ceed67604467b0b9ab12
Merged-by: Michael Niedermayer <michaelni@gmx.at>