* commit '21f68c24':
  avcodec: bump version after rotation api

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