Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:39:20 +0000 (22:39 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:39:39 +0000 (22:39 +0100)
commit172d3568b38c6d0c872293bbffa947a43a8d86ec
tree6f7472f32b167dbdd8384b3eeb117ad1476476c1
parent01938585f4cedbcabb3c879214c24b3fd4f91dcf
parent5d273d3efac340ef8de445c955ff44c7abed4e8f
Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'

* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
  avconv: VAAPI hwcontext initialisation and hwaccel helper

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Makefile
configure
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vaapi.c