sync ffmpeg codec ids. closes #195
Merge remote-tracking branch 'upstream/master'