diff options
author | Alexander Strange <astrange@ithinksw.com> | 2011-04-08 03:03:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 03:03:03 +0200 |
commit | d0df2934ca63a1d5c31602e6558f341bd738bd07 (patch) | |
tree | 8b083b3b5c3881055c2077c2effe04337748e9eb /libavfilter/vf_format.c | |
parent | c88caa522c41cd4108d39d8dd98805e867606ae3 (diff) | |
download | ffmpeg-d0df2934ca63a1d5c31602e6558f341bd738bd07.tar.gz |
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
DUPLICATE mingw32 compilation after 'unbreak avcodec_thread_init'
pthread: validate_thread_parameters() ignored slice-threading being intentionally off
DUPLICATE Remove unnecessary parameter from ff_thread_init() and fix behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_format.c')
0 files changed, 0 insertions, 0 deletions