[PATCH 1/3] Do not initialize res in url_fseek(), in the case !s->seek directly return AVERROR(EPIPE) rather than the pre-defined value of res.
Stefano Sabatini
stefano.sabatini-lala
Sun Apr 18 19:29:54 CEST 2010
Slightly improve readability.
---
libavformat/aviobuf.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 1746d03..8684903 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -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;
--
1.7.0
--EVF5PPMfhYS0aIcm--
More information about the ffmpeg-devel
mailing list