OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9469370
)
h264: Do not print an error when the buffer has to be refilled
author
Luca Barbato
<lu_zero@gentoo.org>
Thu, 6 Aug 2015 09:55:48 +0000
(11:55 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Thu, 6 Aug 2015 09:55:48 +0000
(11:55 +0200)
Partially amends
9469370fb32679352e66826daf77bdd2e6f067b5
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
bf2ae36
..
d4cb030
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-1274,11
+1274,8
@@
static int get_avc_nalsize(H264Context *h, const uint8_t *buf,
int i, nalsize = 0;
if (*buf_index >= buf_size - h->nal_length_size) {
- av_log(h->avctx, AV_LOG_ERROR,
- "AVC: The buffer size %d is too short to read "
- "the nal length size %d at the offset %d.\n",
- buf_size, h->nal_length_size, *buf_index);
- return AVERROR_INVALIDDATA;
+ // the end of the buffer is reached, refill it.
+ return AVERROR(EAGAIN);
}
for (i = 0; i < h->nal_length_size; i++)