Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:22:00 +0000 (13:22 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:22:00 +0000 (13:22 -0300)
commit32c25f06b79f9edcda726f6e043325d40036cdce
tree46e89e540424ad2111c5d65910d2351645ef67f0
parent0153cc49b20ac6c54d5bcd86f5ce53357e6b29aa
parente85f6f7f8d037c0af0f294000718d9ba22753baa
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h