* commit '613a37ec':
  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>