[FFmpeg-cvslog] Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 23 20:48:54 2014 +0200| [d062db788012b94e899008964b93cf01a8389fec] | committer: Michael Niedermayer

Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'

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

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d062db788012b94e899008964b93cf01a8389fec
---