[FFmpeg-cvslog] Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  2 20:16:22 2015 +0100| [cde6e328de214ffe8387641cdc1e433a2c2150f3] | committer: Michael Niedermayer

Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'

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

Conflicts:
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde6e328de214ffe8387641cdc1e433a2c2150f3
---