Changeset 2a7cbc2 in ffmpeg

Timestamp:

Nov 4, 2013, 10:05:52 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3fc26d80

Parents:

4eea41cb (diff), daa7a1d4 (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 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'

• commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18': pthread_slice: rename ThreadContext -> SliceThreadContext

Conflicts:

libavcodec/pthread_slice.c

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

(No files)