Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'
authorClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:26:26 +0000 (17:26 +0100)
committerClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:26:26 +0000 (17:26 +0100)
commitfa02765886294b07a1553570d5c9b5757a78e7f0
treeb023bc040046e298ec2f131214fb84cbc93fb7fe
parent4039076dc39a530f29969b6f42083a03215c6aa5
parente344e65109f1a75ca82aff4cecec44e79197753c
Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'

* commit 'e344e65109f1a75ca82aff4cecec44e79197753c':
  h264dec: do not call finish_setup() if we have not started a frame

This commit is a noop, see bdbbb8f11edbf10add874508c5125c174d8939be

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