libvpx: Pull from upstream

source/libvpx/test/webm_video_source.h

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #ifndef TEST_WEBM_VIDEO_SOURCE_H_
@@ skipping 72 matching lines @@
         chunks_(0),
         buf_(NULL),
         buf_sz_(0),
         frame_(0),
         end_of_file_(false) {
   }
 
   virtual ~WebMVideoSource() {
     if (input_file_)
       fclose(input_file_);
-    if (nestegg_ctx_)
+    if (nestegg_ctx_ != NULL) {
+      if (pkt_ != NULL) {
+        nestegg_free_packet(pkt_);
+      }
       nestegg_destroy(nestegg_ctx_);
+    }
   }
 
   virtual void Init() {
   }
 
   virtual void Begin() {
     input_file_ = OpenTestDataFile(file_name_);
     ASSERT_TRUE(input_file_ != NULL) << "Input file open failed. Filename: "
         << file_name_;
 
@@ skipping 24 matching lines @@
     FillFrame();
   }
 
   void FillFrame() {
     ASSERT_TRUE(input_file_ != NULL);
     if (chunk_ >= chunks_) {
       unsigned int track;
 
       do {
         /* End of this packet, get another. */
-        if (pkt_)
+        if (pkt_ != NULL) {
           nestegg_free_packet(pkt_);
+          pkt_ = NULL;
+        }
 
         int again = nestegg_read_packet(nestegg_ctx_, &pkt_);
         ASSERT_GE(again, 0) << "nestegg_read_packet failed";
         if (!again) {
           end_of_file_ = true;
           return;
         }
 
         ASSERT_FALSE(nestegg_packet_track(pkt_, &track))
             << "nestegg_packet_track failed";
@@ skipping 25 matching lines @@
   unsigned int chunks_;
   uint8_t *buf_;
   size_t buf_sz_;
   unsigned int frame_;
   bool end_of_file_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_WEBM_VIDEO_SOURCE_H_