Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:49:15 +0000 (15:49 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:49:15 +0000 (15:49 +0100)
commit4ded6f9b312731a7cbac7da2c097eeeab8c1954e
tree6b4b1cb6be189309ded8d2f643c877345cc98716
parent8a403b00d1bd8fdbe6fa545cc91b8a1a315e762b
parentdab2034b8679aaacd8aef832cdeb71d0ee8a3358
Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'

* commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358':
  roqvideoenc: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/roqvideoenc.c