aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-26 03:52:14 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-26 03:52:14 +0000
commit278f987a33149351271fca9c89217545d2cae562 (patch)
treede20c7b05cc67d8c70bfb6de32d278ec1cfd27ea /libavformat
parenta1e01307ad879a39703977db739e74ee36bcbc31 (diff)
downloadffmpeg-278f987a33149351271fca9c89217545d2cae562.tar.gz
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
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ffmdec.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 277e883711..1ae24762b6 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;