use THREAD_SAFE_CALLBACKS() to simplifx more code
Signed-off-by: Jun Zhao <mypopy...@gmail.com>
---
libavcodec/pthread_frame.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 5104b1b..36ac0ac 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -908,8 +908,7 @@ static int thread_get_buffer_internal(AVCodecContext
*avctx, ThreadFrame *f, int
}
pthread_mutex_lock(&p->parent->buffer_mutex);
- if (avctx->thread_safe_callbacks ||
- avctx->get_buffer2 == avcodec_default_get_buffer2) {
+ if (THREAD_SAFE_CALLBACKS(avctx)) {
err = ff_get_buffer(avctx, f->f, flags);
} else {
pthread_mutex_lock(&p->progress_mutex);
@@ -976,8 +975,7 @@ void ff_thread_release_buffer(AVCodecContext *avctx,
ThreadFrame *f)
FrameThreadContext *fctx;
AVFrame *dst, *tmp;
int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) ||
- avctx->thread_safe_callbacks ||
- avctx->get_buffer2 == avcodec_default_get_buffer2;
+ THREAD_SAFE_CALLBACKS(avctx);
if (!f->f || !f->f->buf[0])
return;
--
1.7.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
