[FFmpeg-cvslog] Merge commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Mar 18 20:02:10 2017 +0100| [77d590cd9c5b6799cede11a43b03321eca3b0fab] | committer: Clément Bœsch

Merge commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f'

* commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f':
  hwcontext_vaapi: Try the first render node as the default DRM device

This commit is a noop, see 8d47d8407569aade0c0d564600919349789dc38b

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77d590cd9c5b6799cede11a43b03321eca3b0fab
---