* commit 'b94ec304':
  lavc: Update version and APIchanges

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>