* commit '593d2326':
  dv: Replace a magic number by sizeof()

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