diff options
| -rw-r--r-- | test/video_source.h | 7 | ||||
| -rw-r--r-- | test/y4m_test.cc | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/test/video_source.h b/test/video_source.h index c924f964f..84bfa8e53 100644 --- a/test/video_source.h +++ b/test/video_source.h @@ -92,12 +92,7 @@ class TempOutFile { 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; } } diff --git a/test/y4m_test.cc b/test/y4m_test.cc index d4a2ede20..17cd78207 100644 --- a/test/y4m_test.cc +++ b/test/y4m_test.cc @@ -141,11 +141,11 @@ class Y4mVideoWriteTest 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; |