Motown: New wrapper classes for ffmpeg format context and io context

services/media/framework_ffmpeg/ffmpeg_decoder_base.cc

Index: services/media/framework_ffmpeg/ffmpeg_decoder_base.cc
diff --git a/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc b/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc
index 80bbe4f33f8372bdfa8f2d8ba0de4cdbff48379a..60a03852ea011741cdcf4f7c79fd6a4b019fdfd1 100644
--- a/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc
+++ b/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "services/media/framework_ffmpeg/av_codec_context.h"
 #include "services/media/framework_ffmpeg/ffmpeg_decoder_base.h"
-#include "services/media/framework_ffmpeg/ffmpeg_type_converters.h"
 
 namespace mojo {
 namespace media {
@@ -18,7 +18,7 @@ FfmpegDecoderBase::FfmpegDecoderBase(AvCodecContextPtr av_codec_context) :
 FfmpegDecoderBase::~FfmpegDecoderBase() {}
 
 std::unique_ptr<StreamType> FfmpegDecoderBase::output_stream_type() {
-  return StreamTypeFromAVCodecContext(*av_codec_context_);
+  return AvCodecContext::GetStreamType(*av_codec_context_);
 }
 
 void FfmpegDecoderBase::Flush() {