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

avformat/aviobuf: factorize buffer_size out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-01 22:55:37 +01:00
parent 7e268a8afa
commit 2adf422ce2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/aviobuf.c
View File

@@ -201,12 +201,14 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
int64_t offset1; int64_t offset1;
int64_t pos; int64_t pos;
int force = whence & AVSEEK_FORCE; int force = whence & AVSEEK_FORCE;
int buffer_size;
whence &= ~AVSEEK_FORCE; whence &= ~AVSEEK_FORCE;
if(!s) if(!s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
pos = s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer)); buffer_size = s->buf_end - s->buffer;
pos = s->pos - (s->write_flag ? 0 : buffer_size);
if (whence != SEEK_CUR && whence != SEEK_SET) if (whence != SEEK_CUR && whence != SEEK_SET)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@@ -219,7 +221,7 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
} }
offset1 = offset - pos; offset1 = offset - pos;
if (!s->must_flush && (!s->direct || !s->seek) && if (!s->must_flush && (!s->direct || !s->seek) &&
offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) { offset1 >= 0 && offset1 <= buffer_size) {
/* 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 if ((!s->seekable || } else if ((!s->seekable ||