Changeset 2db89765 in ffmpeg

Timestamp:
May 26, 2014, 2:35:52 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2d56f0d0
Parents:
99d742aa (diff), fc9c857c (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.
git-author:
Michael Niedermayer <michaelni@gmx.at> (05/26/14 14:35:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/26/14 14:35:52)
Message:

Merge remote-tracking branch 'cigaes/master'

  • cigaes/master: ffmpeg: use thread message API. lavu: add thread message API. compat/w32pthreads: add return value to pthread_cond_init().

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.