* commit 'b97f427f':
  lavf: Explicitly convert types at function pointer assignment

Conflicts:
	libavformat/avio.c
	libavformat/aviobuf.c
	libavformat/swfenc.c

See: a76a2ffe and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>