Commit 1127b35f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b9f76d19'

* commit 'b9f76d19':
  hevc_ps: make sure failing to decode an SPS always returns an error

Conflicts:
	libavcodec/hevc_ps.c

See: 15893adbMerged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents afa97144 b9f76d19
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment