Changeset 77510a96 in ffmpeg

Timestamp:

Jun 8, 2015, 8:48:14 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3d663574

Parents:

d1f7b313 (diff), bc1eace1 (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 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'

• commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a': jack: Check memory allocation

Conflicts:

libavdevice/jack.c

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

(No files)