Merge "Removes fileno check to prevent valgrind error"

This commit is contained in:
Deb Mukherjee
2014-08-15 14:04:18 -07:00
committed by Gerrit Code Review
2 changed files with 3 additions and 8 deletions

View File

@@ -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;
}
}

View File

@@ -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;