diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-26 18:35:47 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-26 18:35:52 +0400 |
commit | 2db89765f3fc5e1fdf12fc0158feef23db8ce2c1 (patch) | |
tree | fb23b53167c7756eaf39274319c31f509d60d5cb /libavformat/cafenc.c | |
parent | 99d742aac41bf613e0b797b1f809040c9b426536 (diff) | |
parent | fc9c857c2d1b61dbbd104750ca1533c4a4658655 (diff) |
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>
Diffstat (limited to 'libavformat/cafenc.c')
0 files changed, 0 insertions, 0 deletions