* commit '8692d74b':
  mov: Add option to keep exact packet sequence after seeking

Conflicts:
	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

See: 414d6547Merged-by: Michael Niedermayer <michaelni@gmx.at>