[FFmpeg-cvslog] Fix standalone compilation of pipe protocol.

Diego Biurrun git at videolan.org
Thu May 5 03:30:46 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed May  4 19:20:03 2011 +0200| [8799541a0a7bd84c04a2fac73bf819aaf53fc302] | committer: Diego Biurrun

Fix standalone compilation of pipe protocol.

file_check() is not only used by the file protocol, adjust #ifdef accordingly.

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

 libavformat/file.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavformat/file.c b/libavformat/file.c
index 6a3ed5a..649640a 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -51,6 +51,19 @@ static int file_get_handle(URLContext *h)
     return (intptr_t) h->priv_data;
 }
 
+static int file_check(URLContext *h, int mask)
+{
+    struct stat st;
+    int ret = stat(h->filename, &st);
+    if (ret < 0)
+        return AVERROR(errno);
+
+    ret |= st.st_mode&S_IRUSR ? mask&AVIO_FLAG_READ  : 0;
+    ret |= st.st_mode&S_IWUSR ? mask&AVIO_FLAG_WRITE : 0;
+
+    return ret;
+}
+
 #if CONFIG_FILE_PROTOCOL
 
 static int file_open(URLContext *h, const char *filename, int flags)
@@ -95,19 +108,6 @@ static int file_close(URLContext *h)
     return close(fd);
 }
 
-static int file_check(URLContext *h, int mask)
-{
-    struct stat st;
-    int ret = stat(h->filename, &st);
-    if (ret < 0)
-        return AVERROR(errno);
-
-    ret |= st.st_mode&S_IRUSR ? mask&AVIO_FLAG_READ  : 0;
-    ret |= st.st_mode&S_IWUSR ? mask&AVIO_FLAG_WRITE : 0;
-
-    return ret;
-}
-
 URLProtocol ff_file_protocol = {
     .name                = "file",
     .url_open            = file_open,



More information about the ffmpeg-cvslog mailing list