Merge "Add unit tests for ffmpeg2theora ogg recognition bug"