Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
ape: 3.80-3.92 decoding support
h264: Remove an unused variable
Conflicts:
libavcodec/apedec.c
libavformat/ape.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>