Commit 98c7f974 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '86eee85d'

* commit '86eee85d':
  bytestream2: set the reader to the end when reading more than available
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents f14fc559 86eee85d
......@@ -71,8 +71,10 @@ static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g) \
} \
static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \
{ \
if (g->buffer_end - g->buffer < bytes) \
if (g->buffer_end - g->buffer < bytes) { \
g->buffer = g->buffer_end; \
return 0; \
} \
return bytestream2_get_ ## name ## u(g); \
} \
static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment