commit 4851b99bf181f5c0667a7a97d3685773126f7b51
author Deb Mukherjee <debargha@google.com> Thu Aug 14 14:59:50 2014 -0700
committer Deb Mukherjee <debargha@google.com> Fri Aug 15 09:20:54 2014 -0700
tree ecfabdfb17a4e352d4aed598aefdb425e91f7695
parent 54f8cb78c6eecc78e666e6c39b64afcdf03591f8

Removes fileno check to prevent valgrind error

Explicitly makes the fileptr null when close source is called
on a temporary file. This avoids a valgrind error.

Change-Id: I9c364290eeb6842fde946dd9bf817814c7178aaa

test/video_source.h

diff --git a/test/video_source.h b/test/video_source.h
index c924f96..84bfa8e 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -92,12 +92,7 @@
  protected:
   void CloseFile() {
     if (file_) {
-      // Close if file pointer is associated with an open file
-#if defined(_WIN32)
-      if (file_->_ptr != NULL) fclose(file_);
-#else
-      if (fileno(file_) != -1) fclose(file_);
-#endif
+      fclose(file_);
       file_ = NULL;
     }
   }

test/y4m_test.cc

diff --git a/test/y4m_test.cc b/test/y4m_test.cc
index d4a2ede..17cd782 100644
--- a/test/y4m_test.cc
+++ b/test/y4m_test.cc
@@ -141,11 +141,11 @@
   Y4mVideoWriteTest() {}
 
   virtual ~Y4mVideoWriteTest() {
-    CloseSource();
     delete tmpfile_;
+    input_file_ = NULL;
   }
 
-  virtual void ReplaceInputFile(FILE *input_file) {
+  void ReplaceInputFile(FILE *input_file) {
     CloseSource();
     frame_ = 0;
     input_file_ = input_file;