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)
commit2db89765f3fc5e1fdf12fc0158feef23db8ce2c1
treefb23b53167c7756eaf39274319c31f509d60d5cb
parent99d742aac41bf613e0b797b1f809040c9b426536
parentfc9c857c2d1b61dbbd104750ca1533c4a4658655
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>