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 20 matching lines @@
         framerate_numerator_(0),
         framerate_denominator_(0),
         y4m_() {
   }
 
   virtual ~Y4mVideoSource() {
     vpx_img_free(img_.get());
     CloseSource();
   }
 
-  virtual void Begin() {
+  virtual void OpenSource() {
     CloseSource();
     input_file_ = OpenTestDataFile(file_name_);
     ASSERT_TRUE(input_file_ != NULL) << "Input file open failed. Filename: "
-        << file_name_;
+                                     << file_name_;
+  }
 
-    y4m_input_open(&y4m_, input_file_, NULL, 0, 0);
+  virtual void ReadSourceToStart() {
+    ASSERT_TRUE(input_file_ != NULL);
+    ASSERT_FALSE(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++) {
-        Next();
+      Next();
     }
+    FillFrame();
+  }
 
-    FillFrame();
+  virtual void Begin() {
+    OpenSource();
+    ReadSourceToStart();
   }
 
   virtual void Next() {
     ++frame_;
     FillFrame();
   }
 
   virtual vpx_image_t *img() const {
     return (frame_ < limit_) ? img_.get() : NULL;
   }
@@ skipping 35 matching lines @@
   unsigned int limit_;
   unsigned int frame_;
   int framerate_numerator_;
   int framerate_denominator_;
   y4m_input y4m_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_Y4M_VIDEO_SOURCE_H_