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)
* commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358':
  roqvideoenc: Drop broken disabled cruft

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

Simple merge