Merge pull request #145 from cambell-prince/ffmpeg-dshowparams

ffmpeg: Add support for arbitrary ffmpeg options in ffmpeg_producer

diff --cc modules/ffmpeg/consumer/ffmpeg_consumer.cpp
Simple merge