* commit 'afc86853':
  avf: split off format register and lookup function

Conflicts:
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>