--- a/content/media/ogg/OggWriter.cpp
+++ b/content/media/ogg/OggWriter.cpp
@@ -17,16 +17,24 @@ namespace mozilla {
 
 OggWriter::OggWriter() : ContainerWriter()
 {
   if (NS_FAILED(Init())) {
     LOG("ERROR! Fail to initialize the OggWriter.");
   }
 }
 
+OggWriter::~OggWriter()
+{
+  if (mInitialized) {
+    ogg_stream_clear(&mOggStreamState);
+  }
+  // mPacket's data was always owned by us, no need to ogg_packet_clear.
+}
+
 nsresult
 OggWriter::Init()
 {
   MOZ_ASSERT(!mInitialized);
 
   // The serial number (serialno) should be a random number, for the current
   // implementation where the output file contains only a single stream, this
   // serialno is used to differentiate between files.

--- a/content/media/ogg/OggWriter.h
+++ b/content/media/ogg/OggWriter.h
@@ -17,16 +17,17 @@ namespace mozilla {
  * to the Ogg stream.
  * For more details, please reference:
  * http://www.xiph.org/ogg/doc/libogg/encoding.html
  */
 class OggWriter : public ContainerWriter
 {
 public:
   OggWriter();
+  ~OggWriter();
 
   nsresult WriteEncodedTrack(const EncodedFrameContainer &aData,
                              uint32_t aFlags = 0) MOZ_OVERRIDE;
 
   nsresult GetContainerData(nsTArray<nsTArray<uint8_t> >* aOutputBufs,
                             uint32_t aFlags = 0) MOZ_OVERRIDE;
 
   // Check metadata type integrity and reject unacceptable track encoder.