[FFmpeg-cvslog] r24076 - trunk/libavformat/file.c

[mru]

Author: mru
Date: Tue Jul  6 16:28:32 2010
New Revision: 24076

Log:
Add #ifdefs around code specific to file and pipe protocols

Modified:
   trunk/libavformat/file.c

Modified: trunk/libavformat/file.c
==============================================================================
--- trunk/libavformat/file.c	Tue Jul  6 15:22:44 2010	(r24075)
+++ trunk/libavformat/file.c	Tue Jul  6 16:28:32 2010	(r24076)
@@ -33,6 +33,25 @@
 
 /* standard file protocol */
 
+static int file_read(URLContext *h, unsigned char *buf, int size)
+{
+    int fd = (intptr_t) h->priv_data;
+    return read(fd, buf, size);
+}
+
+static int file_write(URLContext *h, const unsigned char *buf, int size)
+{
+    int fd = (intptr_t) h->priv_data;
+    return write(fd, buf, size);
+}
+
+static int file_get_handle(URLContext *h)
+{
+    return (intptr_t) h->priv_data;
+}
+
+#if CONFIG_FILE_PROTOCOL
+
 static int file_open(URLContext *h, const char *filename, int flags)
 {
     int access;
@@ -57,18 +76,6 @@ static int file_open(URLContext *h, cons
     return 0;
 }
 
-static int file_read(URLContext *h, unsigned char *buf, int size)
-{
-    int fd = (intptr_t) h->priv_data;
-    return read(fd, buf, size);
-}
-
-static int file_write(URLContext *h, const unsigned char *buf, int size)
-{
-    int fd = (intptr_t) h->priv_data;
-    return write(fd, buf, size);
-}
-
 /* XXX: use llseek */
 static int64_t file_seek(URLContext *h, int64_t pos, int whence)
 {
@@ -87,11 +94,6 @@ static int file_close(URLContext *h)
     return close(fd);
 }
 
-static int file_get_handle(URLContext *h)
-{
-    return (intptr_t) h->priv_data;
-}
-
 URLProtocol file_protocol = {
     "file",
     file_open,
@@ -102,7 +104,9 @@ URLProtocol file_protocol = {
     .url_get_file_handle = file_get_handle,
 };
 
-/* pipe protocol */
+#endif /* CONFIG_FILE_PROTOCOL */
+
+#if CONFIG_PIPE_PROTOCOL
 
 static int pipe_open(URLContext *h, const char *filename, int flags)
 {
@@ -133,3 +137,5 @@ URLProtocol pipe_protocol = {
     file_write,
     .url_get_file_handle = file_get_handle,
 };
+
+#endif /* CONFIG_PIPE_PROTOCOL */