generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change ffm_write_write_index to return int, and return if error occured.

Browse Source 
Patch by Patrik Kullman, patrik at yes dot nu

Originally committed as revision 17172 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Patrik Kullman 2009-02-12 02:15:07 +00:00 committed by Baptiste Coudurier
parent 22009729d7
commit 6fcce4f995
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@ -1180,7 +1180,7 @@ int64_t av_gettime(void);
/* ffm-specific for ffserver */ /* ffm-specific for ffserver */
#define FFM_PACKET_SIZE 4096 #define FFM_PACKET_SIZE 4096
int64_t ffm_read_write_index(int fd); int64_t ffm_read_write_index(int fd);
void ffm_write_write_index(int fd, int64_t pos); int ffm_write_write_index(int fd, int64_t pos);
void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size); void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size);
/** /**

6
libavformat/ffmdec.c
View File

@ -34,7 +34,7 @@ int64_t ffm_read_write_index(int fd)
return AV_RB64(buf); return AV_RB64(buf);
} }
void ffm_write_write_index(int fd, int64_t pos) int ffm_write_write_index(int fd, int64_t pos)
{ {
uint8_t buf[8]; uint8_t buf[8];
int i; int i;
@ -42,7 +42,9 @@ void ffm_write_write_index(int fd, int64_t pos)
for(i=0;i<8;i++) for(i=0;i<8;i++)
buf[i] = (pos >> (56 - i * 8)) & 0xff; buf[i] = (pos >> (56 - i * 8)) & 0xff;
lseek(fd, 8, SEEK_SET); lseek(fd, 8, SEEK_SET);
write(fd, buf, 8); if (write(fd, buf, 8) != 8)
return AVERROR(EIO);
return 8;
} }
void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size) void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size)