Merge commit '077b55943330150db0eafd36bbee614697cabd98'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 14:38:20 +0000 (16:38 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 14:41:09 +0000 (16:41 +0200)
* commit '077b55943330150db0eafd36bbee614697cabd98':
  hevc: handle a NULL sps in set_sps() properly

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/hevc.c

@@@ -326,15 -429,19 +326,19 @@@ static void export_stream_params(AVCode
                    num, den, 1 << 30);
  }
  
 -static int set_sps(HEVCContext *s, const HEVCSPS *sps)
 +static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fmt)
  {
 -    #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL)
 +    #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL + CONFIG_HEVC_VDPAU_HWACCEL)
      enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
 -    int ret;
 +    int ret, i;
  
-     export_stream_params(s->avctx, &s->ps, sps);
      pic_arrays_free(s);
+     s->ps.sps = NULL;
+     s->ps.vps = NULL;
+     if (!sps)
+         return 0;
      ret = pic_arrays_init(s, sps);
      if (ret < 0)
          goto fail;