diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-10 11:11:42 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-10 11:11:42 +0200 |
| commit | b1d547fe024a3ba223e4d0d7f73617b71d629827 (patch) | |
| tree | 76ed724896fc605274090b08930dcb1ad54bcd91 /libavformat/ftp.c | |
| parent | 46f15de8a4ea84f68c641f3e94149b72c16dbc56 (diff) | |
| parent | 0f562f5b833d603e04123d198c59f8b2b5eb43e4 (diff) | |
| download | ffmpeg-b1d547fe024a3ba223e4d0d7f73617b71d629827.tar.gz | |
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>
Diffstat (limited to 'libavformat/ftp.c')
0 files changed, 0 insertions, 0 deletions