Fixes to ffmpeg-1.1.x (issue #108)