diff -r 000000000000 -r 6474c204b198 content/media/fmp4/ffmpeg/FFmpegDecoderModule.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/media/fmp4/ffmpeg/FFmpegDecoderModule.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __FFmpegDecoderModule_h__
+#define __FFmpegDecoderModule_h__
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla
+{
+
+#ifdef PR_LOGGING
+extern PRLogModuleInfo* GetFFmpegDecoderLog();
+#define FFMPEG_LOG(...) PR_LOG(GetFFmpegDecoderLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#else
+#define FFMPEG_LOG(...)
+#endif
+
+class FFmpegDecoderModule : public PlatformDecoderModule
+{
+public:
+  FFmpegDecoderModule();
+  virtual ~FFmpegDecoderModule();
+
+  static bool Link();
+
+  virtual nsresult Shutdown() MOZ_OVERRIDE;
+
+  virtual MediaDataDecoder* CreateH264Decoder(
+    const mp4_demuxer::VideoDecoderConfig& aConfig,
+    mozilla::layers::LayersBackend aLayersBackend,
+    mozilla::layers::ImageContainer* aImageContainer,
+    MediaTaskQueue* aVideoTaskQueue,
+    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
+
+  virtual MediaDataDecoder* CreateAACDecoder(
+    const mp4_demuxer::AudioDecoderConfig& aConfig,
+    MediaTaskQueue* aAudioTaskQueue,
+    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
+
+private:
+  static bool sFFmpegLinkDone;
+};
+
+} // namespace mozilla
+
+#endif // __FFmpegDecoderModule_h__