Merge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:17:57 +0000 (14:17 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:18:02 +0000 (14:18 +0100)
commitf8a4b8bc40595e0960954ac34778dfab821ebf79
tree70ed36abb4e5c93c78851e499d09c4a5ef90a908
parent92d934106cb299139df9327d0d0dd53cd427e73c
parenteae2ebded3b801ed55d32746b98db88ffe196f4f
Merge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f'

* commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f':
  libxvid: Create extradata in init using a dummy frame

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>