Revert "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 51 matching lines @@
 
   void FillFrame() {
     ASSERT_TRUE(vpx_ctx_->file != NULL);
     const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_, &buf_sz_);
     ASSERT_GE(status, 0) << "webm_read_frame failed";
     if (status == 1) {
       end_of_file_ = true;
     }
   }
 
-  void SeekToNextKeyFrame() {
-    ASSERT_TRUE(vpx_ctx_->file != NULL);
-    do {
-      const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_, &buf_sz_);
-      ASSERT_GE(status, 0) << "webm_read_frame failed";
-      ++frame_;
-      if (status == 1) {
-        end_of_file_ = true;
-      }
-    } while (!webm_ctx_->is_key_frame && !end_of_file_);
-  }
-
   virtual const uint8_t *cxdata() const {
     return end_of_file_ ? NULL : buf_;
   }
   virtual size_t frame_size() const { return buf_sz_; }
   virtual unsigned int frame_number() const { return frame_; }
 
  protected:
   std::string file_name_;
   VpxInputContext *vpx_ctx_;
   WebmInputContext *webm_ctx_;
   uint8_t *buf_;
   size_t buf_sz_;
   unsigned int frame_;
   bool end_of_file_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_WEBM_VIDEO_SOURCE_H_