James Almer 32c25f06b7 Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa' ...

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

Conflicts:
    doc/APIchanges
    libavcodec/version.h

Merged-by: James Almer <jamrial@gmail.com>

2016-09-28 13:22:00 -03:00

101 KiB

Raw Blame History

View Raw