Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'

* commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f':
  hevc: check that VPS referenced from SPS exists

Conflicts:
	libavcodec/hevc_ps.c

See: d66bab0a69
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/hevc_ps.c

@@ -636,7 +636,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
     }
 
     if (!s->vps_list[sps->vps_id]) {
-        av_log(s->avctx, AV_LOG_ERROR, "VPS does not exist \n");
+        av_log(s->avctx, AV_LOG_ERROR, "VPS %d does not exist\n",
+               sps->vps_id);
         ret = AVERROR_INVALIDDATA;
         goto err;
     }