* commit '18fb38fb':
  mov: Remove a variable that is set but never used

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