Merge commit '7e2561fa8313982aa21f7657953eedeeb33b210d'
authorMatthieu Bouron <matthieu.bouron@gmail.com>
Wed, 29 Mar 2017 21:31:20 +0000 (23:31 +0200)
committerMatthieu Bouron <matthieu.bouron@gmail.com>
Wed, 29 Mar 2017 21:33:20 +0000 (23:33 +0200)
commit78e871ebbcc6f3c877e7292c4dda0c9979f8ede4
treedde035107feb68839a074828a4c9f4c36e27fa3d
parentb4016ef31a6ea007e481427ade35ac35d1519170
parent7e2561fa8313982aa21f7657953eedeeb33b210d
Merge commit '7e2561fa8313982aa21f7657953eedeeb33b210d'

* commit '7e2561fa8313982aa21f7657953eedeeb33b210d':
  lavfi: Use ff_get_video_buffer in all filters using hwframes
  vf_hwupload_cuda: Fix build error

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
libavfilter/vf_deinterlace_qsv.c
libavfilter/vf_hwupload.c
libavfilter/vf_hwupload_cuda.c
libavfilter/vf_scale_qsv.c
libavfilter/vf_scale_vaapi.c