Changeset 6ed8341 in ffmpeg

Timestamp:

Jun 1, 2015, 12:25:04 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

abee1972

Parents:

615e73a (diff), 0994e142 (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 '0994e142132200c706f704271b5a7ae81d128f5c'

• commit '0994e142132200c706f704271b5a7ae81d128f5c': pthread: Check memory allocation

Conflicts:

libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)