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)
* 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>
1  2 
libavfilter/vf_deinterlace_qsv.c
libavfilter/vf_hwupload.c
libavfilter/vf_hwupload_cuda.c
libavfilter/vf_scale_qsv.c
libavfilter/vf_scale_vaapi.c

Simple merge
Simple merge
index 49f34b6c52b87ce7d866386c46dd39dac71a0777,0ab5276933047db63bb4d88579298fd356749594..1e47ada242ef0df58dbfc11b732a2f88497a70eb
@@@ -113,7 -151,7 +113,7 @@@ static int cudaupload_config_output(AVF
  static int cudaupload_filter_frame(AVFilterLink *link, AVFrame *in)
  {
      AVFilterContext   *ctx = link->dst;
--    CudaUploadContext   *s = ctx->priv;
++    AVFilterLink  *outlink = ctx->outputs[0];
  
      AVFrame *out = NULL;
      int ret;
Simple merge
index 8221849ee0805f3a6e3d35c451c5c616125b9e1d,67648a9aa014eaa954d9305dbd549ab92fae48cf..c4334c7664eec84ab2dd944dc84d8f62c5867283
@@@ -31,7 -31,7 +31,8 @@@
  #include "avfilter.h"
  #include "formats.h"
  #include "internal.h"
 +#include "scale.h"
+ #include "video.h"
  
  typedef struct ScaleVAAPIContext {
      const AVClass *class;