Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 14 Apr 2016 12:33:37 +0000 (13:33 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 14 Apr 2016 12:33:37 +0000 (13:33 +0100)
commitafccfaf26ac8fae3257302a74110b40615dfa05d
tree8d624efea672bfa209398c7157ab9fdcc123c49e
parent7af788aa625735fa9b3ff2e647f497c62127e855
parentb1f01e85a92d401a9b29c79f23db36b7685e8c09
Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'

* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
  lavu: add a way to query hwcontext frame constraints

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
libavutil/hwcontext.c
libavutil/hwcontext.h
libavutil/hwcontext_internal.h
libavutil/version.h