Changeset b1d547fe in ffmpeg

Timestamp:

Aug 10, 2015, 9:11:42 AM (9 years ago)

Author:

Hendrik Leppkes <h.leppkes@gmail.com>

Branches:

master

Children:

e1def4ff

Parents:

46f15de8 (diff), 0f562f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)