* commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb':
avconv: Document the -init_hw_device option
avconv: Enable generic hwaccel support for VDPAU
lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API
lavc: Add hwaccel_flags field to AVCodecContext
avconv: Enable generic hwaccel support for VAAPI
avconv: Generic device setup
hwcontext: Make it easier to work with device types
hwcontext: Add device derivation