Merge commit '620f88a0b94a651c6cc912b1fb32d308762d59b5'
authorMark Thompson <sw@jkqxz.net>
Thu, 16 Nov 2017 00:03:10 +0000 (00:03 +0000)
committerMark Thompson <sw@jkqxz.net>
Thu, 16 Nov 2017 00:07:40 +0000 (00:07 +0000)
commit6727cfea5e416c32591563a6e91936629ae16185
tree9c735dd95a1728de24158d5d0b90f2fdcc633c5b
parent040a92c21f2a5fa1570521620acb600af0e058a6
parent620f88a0b94a651c6cc912b1fb32d308762d59b5
Merge commit '620f88a0b94a651c6cc912b1fb32d308762d59b5'

* commit '620f88a0b94a651c6cc912b1fb32d308762d59b5':
  vaapi_h264: Add missing return value check
  h264_metadata: Fix clearing SEI payload in error case
  cbs_h2645: Fix memory leak on when reading SEI fails
  cbs: Add a missing return value check

This commit is a noop, see
03b1470088e6e4a11e5db0efd8c26d9ac8304d31
d792613badfe7e7ca3552533e691c5015991a98a
41272e112b389e61b875ba2372a64a251f1da9fc
6734eef6b8b464139fdc140ec9bc9e8d74173869

Merged-by: Mark Thompson <sw@jkqxz.net>