Browse Source

avcodec/pthread: Make sure ff_thread_finish_setup() conditions match

Prevents warning from being shown due to multiple calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 13 years ago
parent
commit
94b3a666fa
1 changed files with 5 additions and 6 deletions
  1. +5
    -6
      libavcodec/pthread.c

+ 5
- 6
libavcodec/pthread.c View File

@@ -362,6 +362,9 @@ static int thread_init(AVCodecContext *avctx)
return 0; return 0;
} }


#define THREAD_SAFE_CALLBACKS(avctx) \
((avctx)->thread_safe_callbacks || (!(avctx)->get_buffer && (avctx)->get_buffer2 == avcodec_default_get_buffer2))

/** /**
* Codec worker thread. * Codec worker thread.
* *
@@ -383,11 +386,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg)


if (fctx->die) break; if (fctx->die) break;


if (!codec->update_thread_context && (avctx->thread_safe_callbacks || (
#if FF_API_GET_BUFFER
!avctx->get_buffer &&
#endif
avctx->get_buffer2 == avcodec_default_get_buffer2)))
if (!codec->update_thread_context && THREAD_SAFE_CALLBACKS(avctx))
ff_thread_finish_setup(avctx); ff_thread_finish_setup(avctx);


avcodec_get_frame_defaults(&p->frame); avcodec_get_frame_defaults(&p->frame);
@@ -1026,7 +1025,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
pthread_mutex_unlock(&p->progress_mutex); pthread_mutex_unlock(&p->progress_mutex);


} }
if (!avctx->thread_safe_callbacks && !avctx->codec->update_thread_context)
if (!THREAD_SAFE_CALLBACKS(avctx) && !avctx->codec->update_thread_context)
ff_thread_finish_setup(avctx); ff_thread_finish_setup(avctx);


if (err) if (err)


Loading…
Cancel
Save