* commit '0f562f5b':
  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>