Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:53:50 +0000 (22:53 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:53:50 +0000 (22:53 +0100)
commitf93c409c0b71d6353129fef3e85f89373d19d4d5
tree1aa1dd57f5a681d36e4ecbbad3651887f0711e9c
parent4c3732c881735785a8d8e872589a31564854f183
parent44f05f15d4a34ef2f0d62259e5d5b43371bc0954
Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'

* commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954':
  build: Do not check the vaapi_encode.h header if VAAPI is not enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/Makefile