Motown: Ffmpeg video decoder

services/media/framework_ffmpeg/av_codec_context.h

Index: services/media/framework_ffmpeg/av_codec_context.h
diff --git a/services/media/framework_ffmpeg/av_codec_context.h b/services/media/framework_ffmpeg/av_codec_context.h
index 0a552981175c4a5d8a4d1243ce268e2cda44c11e..f3506cf6c63d0774fd9fd2d088aa1c70c666768c 100644
--- a/services/media/framework_ffmpeg/av_codec_context.h
+++ b/services/media/framework_ffmpeg/av_codec_context.h
@@ -11,6 +11,9 @@ extern "C" {
 #include "third_party/ffmpeg/libavformat/avformat.h"
 }
 
+// Ffmeg defines this...undefine.
+#undef PixelFormat
+
 namespace mojo {
 namespace media {
 
@@ -29,6 +32,14 @@ struct AvCodecContext {
   static std::unique_ptr<StreamType> GetStreamType(const AVCodecContext& from);
 };
 
+// Converts an AVPixelFormat to a PixelFormat.
+VideoStreamType::PixelFormat PixelFormatFromAVPixelFormat(
+    AVPixelFormat av_pixel_format);
+
+// Converts a PixelFormat to an AVPixelFormat.
+AVPixelFormat AVPixelFormatFromPixelFormat(
+    VideoStreamType::PixelFormat pixel_format);
+
 }  // namespace media
 }  // namespace mojo