Merge commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 14:50:06 +0000 (16:50 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 14:50:06 +0000 (16:50 +0200)
* commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc':
  hevc_ps: make sure failing to decode an SPS always returns an error

Conflicts:
libavcodec/hevc_ps.c

See: 15893adbdb6a7000f59207bcb88def6e7b4812b9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge