Merge commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4'

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

Conflicts:
	libavcodec/h264.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/161/head^2
Hendrik Leppkes 10 years ago
commit b1d547fe02
  1. 1
      libavcodec/h264.h

@ -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);
}

Loading…
Cancel
Save