Revision ba9ef8d0 libavcodec/utils.c

View differences:

libavcodec/utils.c
539 539
    avctx->frame_number = 0;
540 540

  
541 541
    if (HAVE_THREADS && !avctx->thread_opaque) {
542
        ret = ff_thread_init(avctx, avctx->thread_count);
542
        ret = ff_thread_init(avctx);
543 543
        if (ret < 0) {
544 544
            goto free_and_end;
545 545
        }
......
1147 1147
#endif
1148 1148

  
1149 1149
#if !HAVE_THREADS
1150
int ff_thread_init(AVCodecContext *s, int thread_count){
1151
    s->thread_count = thread_count;
1150
int ff_thread_init(AVCodecContext *s){
1152 1151
    return -1;
1153 1152
}
1154 1153
#endif
......
1291 1290

  
1292 1291
int avcodec_thread_init(AVCodecContext *s, int thread_count)
1293 1292
{
1294
    return ff_thread_init(s, thread_count);
1293
    s->thread_count = thread_count;
1294
    return ff_thread_init(s);
1295 1295
}
1296 1296

  
1297 1297
void avcodec_thread_free(AVCodecContext *s)

Also available in: Unified diff