Skip to content
Snippets Groups Projects
Commit 32c25f06 authored by James Almer's avatar James Almer
Browse files

Merge commit 'e85f6f7f' 


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

Conflicts:
    doc/APIchanges
    libavcodec/version.h

Merged-by: default avatarJames Almer <jamrial@gmail.com>
parents 0153cc49 e85f6f7f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment