Revision 043d2ff2 libavcodec/utils.c

View differences:

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

  
542 542
    if (HAVE_THREADS && !avctx->thread_opaque) {
543
        ret = avcodec_thread_init(avctx, avctx->thread_count);
543
        ret = ff_thread_init(avctx, avctx->thread_count);
544 544
        if (ret < 0) {
545 545
            goto free_and_end;
546 546
        }
......
819 819
    }
820 820

  
821 821
    if (HAVE_THREADS && avctx->thread_opaque)
822
        avcodec_thread_free(avctx);
822
        ff_thread_free(avctx);
823 823
    if (avctx->codec && avctx->codec->close)
824 824
        avctx->codec->close(avctx);
825 825
    avcodec_default_free_buffers(avctx);
......
1180 1180
#endif
1181 1181

  
1182 1182
#if !HAVE_THREADS
1183
int avcodec_thread_init(AVCodecContext *s, int thread_count){
1183
int ff_thread_init(AVCodecContext *s, int thread_count){
1184 1184
    s->thread_count = thread_count;
1185 1185
    return -1;
1186 1186
}
......
1319 1319
}
1320 1320

  
1321 1321
#endif
1322

  
1323
#if LIBAVCODEC_VERSION_MAJOR < 53
1324

  
1325
int avcodec_thread_init(AVCodecContext *s, int thread_count)
1326
{
1327
    return ff_thread_init(s, thread_count);
1328
}
1329

  
1330
void avcodec_thread_free(AVCodecContext *s)
1331
{
1332
    return ff_thread_free(s);
1333
}
1334

  
1335
#endif

Also available in: Unified diff