* commit '4f373a51':
  vfwcap: Unbreak building after c201069f

Conflicts:
	libavdevice/vfwcap.c

See: 4d0f6d3fMerged-by: Michael Niedermayer <michaelni@gmx.at>