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)
commitafa97144cff837bbe2ecce47e79321373a82cb94
tree101c402ea913b21021a6e6001b9f138ed5c527a7
parentd13fc982470f5fe89b92ebbb93a101fb2b9e851e
parent077b55943330150db0eafd36bbee614697cabd98
Merge commit '077b55943330150db0eafd36bbee614697cabd98'

* commit '077b55943330150db0eafd36bbee614697cabd98':
  hevc: handle a NULL sps in set_sps() properly

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