ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Mon Aug 10
11:11:42 2015 +0200| [b1d547fe024a3ba223e4d0d7f73617b71d629827] | committer:
Hendrik Leppkes
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1d547fe024a3ba223e4d0d7f73617b71d629827
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
