Changeset 3fc85004 in ffmpeg

Timestamp:

May 28, 2013, 6:59:07 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cf05fe8a

Parents:

2ad28840 (diff), 268bb885 (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 remote-tracking branch 'qatar/master'

• qatar/master: smacker: add a clarification notice about audio decoding configure: make jack depend on pthreads

Conflicts:

configure

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

(No files)