* commit '6a5b8ca4':
  lavf: remove unused code

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