Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 14 Apr 2016 12:49:55 +0000 (13:49 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 14 Apr 2016 12:49:55 +0000 (13:49 +0100)
commit28abb216cbd5736d65973165b830c08815ce0227
tree992cf32eb3eb44dd2007c4108e9564c3317725e6
parenteb2da769bddf7e8f4f3202162dacd17c77770dd8
parent551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'

* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
  lavu: VAAPI hwcontext implementation

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