Merge commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:57:33 +0000 (09:57 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:57:33 +0000 (09:57 +0200)
commit4eb72961844cdfd667740e43abe1b1bc063d657a
treed0e5060083ecacf967ff24be7bcad46e58e1a82f
parent8ee123ac9a7fd609511ff821846920742fba3b7e
parent2fe30b4743c0f4c3bdf37b91ae534cafa85e4036
Merge commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036'

* commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036':
  hevc: Allow parsing external extradata buffers

This commit is a noop as it matches FFmpeg state.

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