diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-03-26 13:55:30 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-03-28 23:07:52 +0200 |
| commit | 46027c7286144294dee565946dccb59f1a8dfeca (patch) | |
| tree | a4bd06202a3882ae15b59c252c75f0b39ced2283 /libavcodec/utils.c | |
| parent | 95c8bb03edf5d5c7310947819c4c8691a5e3dfb0 (diff) | |
| download | ffmpeg-46027c7286144294dee565946dccb59f1a8dfeca.tar.gz | |
Unbreak avcodec_thread_init
avcodec_thread_init currently doesn't do anything at all with pthreads enabled.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2c737d9625..42689e03b9 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -541,7 +541,7 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) avctx->frame_number = 0; if (HAVE_THREADS && !avctx->thread_opaque) { - ret = ff_thread_init(avctx, avctx->thread_count); + ret = ff_thread_init(avctx); if (ret < 0) { goto free_and_end; } @@ -1193,8 +1193,7 @@ int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt) { #endif #if !HAVE_THREADS -int ff_thread_init(AVCodecContext *s, int thread_count){ - s->thread_count = thread_count; +int ff_thread_init(AVCodecContext *s){ return -1; } #endif @@ -1337,7 +1336,9 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field) int avcodec_thread_init(AVCodecContext *s, int thread_count) { - return ff_thread_init(s, thread_count); + s->thread_count = thread_count; + s->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; + return ff_thread_init(s); } void avcodec_thread_free(AVCodecContext *s) |