[FFmpeg-cvslog] tools/ffeval: do not use UNIX-specific /dev/std{in, out} files

Stefano Sabatini git at videolan.org
Tue Oct 16 13:52:43 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Oct 15 21:53:35 2012 +0200| [25f3827e1daf6b75e6b46e2bccaf8cbc273d6b42] | committer: Stefano Sabatini

tools/ffeval: do not use UNIX-specific /dev/std{in,out} files

Should fix behavior when the /dev/ directory is not defined (e.g. on
Windows).

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

 tools/ffeval.c |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/ffeval.c b/tools/ffeval.c
index d1d40c5..0fab877 100644
--- a/tools/ffeval.c
+++ b/tools/ffeval.c
@@ -83,17 +83,23 @@ int main(int argc, char **argv)
         }
     }
 
-    if (!infilename || !strcmp(infilename, "-"))
-        infilename = "/dev/stdin";
-    infile = fopen(infilename, "r");
+    if (!infilename || !strcmp(infilename, "-")) {
+        infilename = "stdin";
+        infile = stdin;
+    } else {
+        infile = fopen(infilename, "r");
+    }
     if (!infile) {
         fprintf(stderr, "Impossible to open input file '%s': %s\n", infilename, strerror(errno));
         return 1;
     }
 
-    if (!outfilename || !strcmp(outfilename, "-"))
-        outfilename = "/dev/stdout";
-    outfile = fopen(outfilename, "w");
+    if (!outfilename || !strcmp(outfilename, "-")) {
+        outfilename = "stdout";
+        outfile = stdout;
+    } else {
+        outfile = fopen(outfilename, "w");
+    }
     if (!outfile) {
         fprintf(stderr, "Impossible to open output file '%s': %s\n", outfilename, strerror(errno));
         return 1;



More information about the ffmpeg-cvslog mailing list