Merge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 09:10:11 +0000 (11:10 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 09:10:11 +0000 (11:10 +0200)
commit03f22c288aff7e2d75c7f993e8626195e84e0842
tree4a5df8c6b8d8f549e7b721fa230b2ee6223d8e19
parent80f91c8d5a6f3c708dd55c3f8e86cbeffcd6bc0e
parentdb0b3dccb3842de134721e8d5c275f56d384340d
Merge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'

* commit 'db0b3dccb3842de134721e8d5c275f56d384340d':
  libx265: Add option to force IDR frames

This commit is a noop, see 8a8902f2213b28a8dab1520bd42e88e5073f1f59

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