har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '86eee85daddb682fa072c2e2657c90a514b855e3'

Browse Source 
* commit '86eee85daddb682fa072c2e2657c90a514b855e3':
  bytestream2: set the reader to the end when reading more than available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-12 21:12:42 +02:00
commit 98c7f9741e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/bytestream.h
View File

@ -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) \ 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 0; \
} \
return bytestream2_get_ ## name ## u(g); \ return bytestream2_get_ ## name ## u(g); \
} \ } \
static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \ static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \