RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not initialize res in url_fseek(), in the case !s->seek directly 

return AVERROR(EPIPE) rather than the pre-defined value of res.

Slightly improve readability.

Originally committed as revision 22939 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-04-21 21:19:25 +00:00
parent 9a32573b49
commit 9d30e0682a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/aviobuf.c
View File

@ -160,7 +160,7 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
return AVERROR_EOF;
s->buf_ptr = s->buf_end + offset - s->pos;
} else {
int64_t res = AVERROR(EPIPE);
int64_t res;
#if CONFIG_MUXERS || CONFIG_NETWORK
if (s->write_flag) {
@ -168,7 +168,9 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
s->must_flush = 1;
}
#endif /* CONFIG_MUXERS || CONFIG_NETWORK */
if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0)
if (!s->seek)
return AVERROR(EPIPE);
if ((res = s->seek(s->opaque, offset, SEEK_SET)) < 0)
return res;
if (!s->write_flag)
s->buf_end = s->buffer;