Merge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 08:02:39 +0000 (10:02 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 08:02:39 +0000 (10:02 +0200)
commit5ce02f4c555a4ca03486bc8f59b52a78c5f9e961
treed0e5060083ecacf967ff24be7bcad46e58e1a82f
parent4eb72961844cdfd667740e43abe1b1bc063d657a
parent47a795727f5433f5238a8a244cf181f61ea5af2c
Merge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'

* commit '47a795727f5433f5238a8a244cf181f61ea5af2c':
  hevc: Support extradata changes from multiple stsd

This commit is a noop, see 25fcbf7a84a485ae358f3fb3519ed4e8a98459cd

Merged-by: Clément Bœsch <cboesch@gopro.com>