[SCM] libav/experimental: move ffserver specific functions up and only include unistd.h in this case

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 278f987a33149351271fca9c89217545d2cae562
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon May 26 03:52:14 2008 +0000

    move ffserver specific functions up and only include unistd.h in this case
    
    Originally committed as revision 13418 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 277e883..1ae2476 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -21,8 +21,37 @@
 
 #include "avformat.h"
 #include "ffm.h"
+#ifdef CONFIG_FFSERVER
 #include <unistd.h>
 
+offset_t ffm_read_write_index(int fd)
+{
+    uint8_t buf[8];
+
+    lseek(fd, 8, SEEK_SET);
+    read(fd, buf, 8);
+    return AV_RB64(buf);
+}
+
+void ffm_write_write_index(int fd, offset_t pos)
+{
+    uint8_t buf[8];
+    int i;
+
+    for(i=0;i<8;i++)
+        buf[i] = (pos >> (56 - i * 8)) & 0xff;
+    lseek(fd, 8, SEEK_SET);
+    write(fd, buf, 8);
+}
+
+void ffm_set_write_index(AVFormatContext *s, offset_t pos, offset_t file_size)
+{
+    FFMContext *ffm = s->priv_data;
+    ffm->write_index = pos;
+    ffm->file_size = file_size;
+}
+#endif // CONFIG_FFSERVER
+
 static int ffm_is_avail_data(AVFormatContext *s, int size)
 {
     FFMContext *ffm = s->priv_data;
@@ -433,35 +462,6 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in
     return 0;
 }
 
-#ifdef CONFIG_FFSERVER
-offset_t ffm_read_write_index(int fd)
-{
-    uint8_t buf[8];
-
-    lseek(fd, 8, SEEK_SET);
-    read(fd, buf, 8);
-    return AV_RB64(buf);
-}
-
-void ffm_write_write_index(int fd, offset_t pos)
-{
-    uint8_t buf[8];
-    int i;
-
-    for(i=0;i<8;i++)
-        buf[i] = (pos >> (56 - i * 8)) & 0xff;
-    lseek(fd, 8, SEEK_SET);
-    write(fd, buf, 8);
-}
-
-void ffm_set_write_index(AVFormatContext *s, offset_t pos, offset_t file_size)
-{
-    FFMContext *ffm = s->priv_data;
-    ffm->write_index = pos;
-    ffm->file_size = file_size;
-}
-#endif // CONFIG_FFSERVER
-
 static int ffm_read_close(AVFormatContext *s)
 {
     AVStream *st;

-- 
Libav/FFmpeg packaging