* 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>