CLI Video Encoder fixes