From: James Almer <jamrial@gmail.com>
Date: Sun, 12 Nov 2017 02:35:00 +0000 (-0300)
Subject: Merge commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4a54ef7a0f4c7ebe3cb0d353bfaa515461846259;p=ffmpeg

Merge commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5'

* commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5':
  hwcontext_vaapi: Set message callbacks on internally-created devices
  vaapi: Always free parameter buffers after vaEndPicture() with libva2
  vaapi: Remove H.264 baseline profile
  configure: Add config option for libva2 (VAAPI 1)
  vaapi: Disable deprecation warnings around use of struct vaapi_context

This commit is a noop, see
375cf55fe9f574e42bd3519f08993125ac66c725
9c7a71145b88e56cb5f67c66f6d27c20c8d06165
bd211bb866f8bf5c372589fc44dc06d1a9509c0a
e339411691e3671b595e556ba3411c1acb8c4692
f3602875b3255c533900df1c7bb4e78ef5e1ce08

Merged-by: James Almer <jamrial@gmail.com>
---

4a54ef7a0f4c7ebe3cb0d353bfaa515461846259