Merge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:50:12 +0000 (09:50 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:50:12 +0000 (09:50 +0200)
commit9a60735fa1b77233c5ad57ccd730dd14bc8e757c
treed0e5060083ecacf967ff24be7bcad46e58e1a82f
parent82ad9cbd32c873bced9adf4a2bb67dcda7294c61
parentbed2c4b2652b1412b584e5545d6dd2ef8c613be0
Merge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'

* commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0':
  lavc: Add hevc main10 profile to avconv cli

This commit is a noop, see 271afd632f4de87db99ec085e75446b648dc6e60

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