Merge commit '5c7f2cf81df06614f255f061850132355a01d75e'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 12:35:28 +0000 (14:35 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 12:35:28 +0000 (14:35 +0200)
commit9bc37352ded50aae512550d6684dc63cda67640b
treee2701c7d37017ff32a3a41c5a633f911f8bf5787
parent76cc100afba25308eaa909acd8804cc0b42057f6
parent5c7f2cf81df06614f255f061850132355a01d75e
Merge commit '5c7f2cf81df06614f255f061850132355a01d75e'

* commit '5c7f2cf81df06614f255f061850132355a01d75e':
  h264_slice: Wait for refs to be available before we use them in error concealment

This commit is a noop, see 4413e950b26396bfb797168e4f81164a022cc6f3

Merged-by: Clément Bœsch <u@pkh.me>