* commit 'e85f6f7f':
  lavc: allow using AVCodecContext.hw_frames_ctx for decoding

Conflicts:
    doc/APIchanges
    libavcodec/version.h
Merged-by: James Almer <jamrial@gmail.com>