libvpx: Pull from upstream

source/libvpx/test/y4m_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_Y4M_VIDEO_SOURCE_H_
@@ skipping 17 matching lines @@
         start_(start),
         limit_(limit),
         frame_(0),
         framerate_numerator_(0),
         framerate_denominator_(0),
         y4m_() {
   }
 
   virtual ~Y4mVideoSource() {
     vpx_img_free(img_.get());
-    y4m_input_close(&y4m_);
-    if (input_file_)
-      fclose(input_file_);
+    CloseSource();
   }
 
   virtual void Begin() {
-    if (input_file_)
-      fclose(input_file_);
+    CloseSource();
     input_file_ = OpenTestDataFile(file_name_);
     ASSERT_TRUE(input_file_ != NULL) << "Input file open failed. Filename: "
         << file_name_;
 
     y4m_input_open(&y4m_, input_file_, NULL, 0, 0);
     framerate_numerator_ = y4m_.fps_n;
     framerate_denominator_ = y4m_.fps_d;
 
     frame_ = 0;
     for (unsigned int i = 0; i < start_; i++) {
@@ skipping 26 matching lines @@
 
   virtual unsigned int limit() const { return limit_; }
 
   virtual void FillFrame() {
     ASSERT_TRUE(input_file_ != NULL);
     // Read a frame from input_file.
     y4m_input_fetch_frame(&y4m_, input_file_, img_.get());
   }
 
  protected:
+  void CloseSource() {
+    y4m_input_close(&y4m_);
+    y4m_ = y4m_input();
+    if (input_file_ != NULL) {
+      fclose(input_file_);
+      input_file_ = NULL;
+    }
+  }
+
   std::string file_name_;
   FILE *input_file_;
   testing::internal::scoped_ptr<vpx_image_t> img_;
   unsigned int start_;
   unsigned int limit_;
   unsigned int frame_;
   int framerate_numerator_;
   int framerate_denominator_;
   y4m_input y4m_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_Y4M_VIDEO_SOURCE_H_