Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 May 2014 14:35:47 +0000 (16:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 May 2014 14:35:52 +0000 (16:35 +0200)
* 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>

Trivial merge