From a80a28725a404f482b1b68fb82da71e4af46912b Mon Sep 17 00:00:00 2001
From: Nathan Toone <nathan@toonetown.com>
Date: Mon, 27 Apr 2015 14:23:00 -0600
Subject: [PATCH] Bug 1158931 - Fix static assertion compilation error; r=snorp

Move the destructor for WebrtcAndroidMediaCodec to be protected instead of public.
---
 .../src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp b/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
index c74925126c62..bee26eac2663 100644
--- a/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
@@ -174,9 +174,6 @@ public:
     CSFLogDebug(logTag,  "%s ", __FUNCTION__);
   }
 
-  virtual ~WebrtcAndroidMediaCodec() {
-  }
-
   nsresult Configure(uint32_t width,
                      uint32_t height,
                      const jobject aSurface,
@@ -507,6 +504,10 @@ public:
     mEncoderCallback = aCallback;
   }
 
+protected:
+  virtual ~WebrtcAndroidMediaCodec() {
+  }
+
 private:
 class OutputDrain : public MediaCodecOutputDrain
   {