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

simplify seek() failure check

Browse Source 
Originally committed as revision 6339 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-09-26 16:09:56 +00:00
parent 4156a436e3
commit 3b9a913db4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/aviobuf.c
View File

@ -123,9 +123,6 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
/* can do the seek inside the buffer */ /* can do the seek inside the buffer */
s->buf_ptr = s->buffer + offset1; s->buf_ptr = s->buffer + offset1;
} else { } else {
if (!s->seek)
return -EPIPE;
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
if (s->write_flag) { if (s->write_flag) {
flush_buffer(s); flush_buffer(s);
@ -136,7 +133,7 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
s->buf_end = s->buffer; s->buf_end = s->buffer;
} }
s->buf_ptr = s->buffer; s->buf_ptr = s->buffer;
if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) if (!s->seek || s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
return -EPIPE; return -EPIPE;
s->pos = offset; s->pos = offset;
} }