* commit '619d5e7d':
  v4l2: Use the codec descriptor facility

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