Merge "Increase OggExtractor's confidence"