hevc: handle a NULL sps in set_sps() properly
authorAnton Khirnov <anton@khirnov.net>
Sun, 12 Jul 2015 16:57:10 +0000 (18:57 +0200)
committerAnton Khirnov <anton@khirnov.net>
Sun, 12 Jul 2015 16:57:10 +0000 (18:57 +0200)
This can happen in update_thread_context(), when the previous frame was
corrupted.

libavcodec/hevc.c

index 6efdfcb..dd56d58 100644 (file)
@@ -435,13 +435,19 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps)
     enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
     int ret;
 
-    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;
 
+    export_stream_params(s->avctx, &s->ps, sps);
+
     if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P) {
 #if CONFIG_HEVC_DXVA2_HWACCEL
         *fmt++ = AV_PIX_FMT_DXVA2_VLD;