Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'

* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
  hevc: do not change the VPS if its contents are the same

Conflicts:
	libavcodec/hevc_ps.c

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

libavcodec/hevc_ps.c

@@ -458,8 +458,14 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
         goto err;
     }
 
+    if (s->vps_list[vps_id] &&
+        !memcmp(s->vps_list[vps_id]->data, vps_buf->data, vps_buf->size)) {
+        av_buffer_unref(&vps_buf);
+    } else {
         av_buffer_unref(&s->vps_list[vps_id]);
         s->vps_list[vps_id] = vps_buf;
+    }
+
     return 0;
 
 err: