* commit 'd6ed604c':
  lavc: remove disabled FF_API_IDCT cruft

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>