Merge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:22:24 +0000 (15:22 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:22:24 +0000 (15:22 +0100)
commit34245eccaf99885e12259c1de00a3af3acfed45a
tree3f1bca29d56bc74b784c3ee118c62339447a5f8d
parent528af33b6f4595f6d77da47eca7e9a5dcda8c84d
parent98114d70e48caf871b0fe9b8e5bf8ebd989b845d
Merge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'

* commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d':
  lavf: VAAPI scale filter

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Changelog
configure
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
libavfilter/vf_scale_vaapi.c