Changeset 0f242e62 in ffmpeg

Timestamp:

Dec 13, 2013, 8:33:13 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f5cf0ea9

Parents:

1e3718e2 (diff), 79d9884e (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: build: Merge pthreads/w32threads OBJS declarations

Conflicts:

libavcodec/Makefile

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

(No files)