git.ffmpeg.org Git - ffmpeg.git/commit

author	Matthieu Bouron <matthieu.bouron@gmail.com>
	Wed, 29 Mar 2017 21:31:20 +0000 (23:31 +0200)
committer	Matthieu Bouron <matthieu.bouron@gmail.com>
	Wed, 29 Mar 2017 21:33:20 +0000 (23:33 +0200)
commit	78e871ebbcc6f3c877e7292c4dda0c9979f8ede4
tree	dde035107feb68839a074828a4c9f4c36e27fa3d	tree \| snapshot
parent	b4016ef31a6ea007e481427ade35ac35d1519170	commit \| diff
parent	7e2561fa8313982aa21f7657953eedeeb33b210d	commit \| diff

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>

FFmpeg git repo

libavfilter/vf_deinterlace_qsv.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_hwupload.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_hwupload_cuda.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_scale_qsv.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_scale_vaapi.c	diff1 \|	diff2 \|	blob \| history