Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'
authorMatthieu Bouron <matthieu.bouron@gmail.com>
Wed, 29 Mar 2017 21:39:40 +0000 (23:39 +0200)
committerMatthieu Bouron <matthieu.bouron@gmail.com>
Wed, 29 Mar 2017 22:02:08 +0000 (00:02 +0200)
commitb5e1ec5660692d7cee360da3ed0434d3b46f40d5
tree853ecad2f21623a52a15577dca710c337823a6c6
parent78e871ebbcc6f3c877e7292c4dda0c9979f8ede4
parente3fb74f7f9a8f1895381355f40c92cac3c1023d9
Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'

* commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9':
  lavfi: Always propagate hw_frames_ctx through links

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
ffmpeg.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/internal.h
libavfilter/vf_deinterlace_qsv.c
libavfilter/vf_hwdownload.c
libavfilter/vf_hwupload.c
libavfilter/vf_hwupload_cuda.c
libavfilter/vf_scale_npp.c
libavfilter/vf_scale_qsv.c
libavfilter/vf_scale_vaapi.c