Commit b1d547fe authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '0f562f5b'

* commit '0f562f5b':
  h264: Do not print an error when the buffer has to be refilled

Conflicts:
	libavcodec/h264.c
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 46f15de8 0f562f5b
......@@ -1192,6 +1192,7 @@ static inline int get_avc_nalsize(H264Context *h, const uint8_t *buf,
int i, nalsize = 0;
if (*buf_index >= buf_size - h->nal_length_size) {
// the end of the buffer is reached, refill it.
return AVERROR(EAGAIN);
}
......
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