[FFmpeg-cvslog] tools/ffhash: Use O_BINARY when available

James Almer git at videolan.org
Fri May 17 00:45:47 CEST 2013


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu May 16 19:10:28 2013 -0300| [54372848f3276ad88cd5b224ce22df343e10d513] | committer: Michael Niedermayer

tools/ffhash: Use O_BINARY when available

This fixes reading files in Windows

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54372848f3276ad88cd5b224ce22df343e10d513
---

 tools/ffhash.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/ffhash.c b/tools/ffhash.c
index 99b928d..8c4a9f1 100644
--- a/tools/ffhash.c
+++ b/tools/ffhash.c
@@ -71,10 +71,13 @@ static void finish(void)
 static int check(char *file)
 {
     uint8_t buffer[SIZE];
-    int fd;
+    int fd, flags = O_RDONLY;
     int ret = 0;
 
-    if (file) fd = open(file, O_RDONLY);
+#ifdef O_BINARY
+    flags |= O_BINARY;
+#endif
+    if (file) fd = open(file, flags);
     else      fd = 0;
     if (fd == -1) {
         printf("%s=OPEN-FAILED: %s:", av_hash_get_name(hash), strerror(errno));



More information about the ffmpeg-cvslog mailing list