Merge commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:11:42 +0000 (11:11 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:11:42 +0000 (11:11 +0200)
commitb1d547fe024a3ba223e4d0d7f73617b71d629827
tree76ed724896fc605274090b08930dcb1ad54bcd91
parent46f15de8a4ea84f68c641f3e94149b72c16dbc56
parent0f562f5b833d603e04123d198c59f8b2b5eb43e4
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>
libavcodec/h264.h