[FFmpeg-cvslog] avcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 25 16:01:42 2013 +0200| [8f0db04b086925f5358ef605e2a77bee041e5dbf] | committer: Michael Niedermayer

avcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f0db04b086925f5358ef605e2a77bee041e5dbf
---

 libavcodec/pthread.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 871fb6e..516e5fc 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -959,11 +959,7 @@ int ff_thread_can_start_frame(AVCodecContext *avctx)
 {
     PerThreadContext *p = avctx->thread_opaque;
     if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP &&
-        (avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks && (
-#if FF_API_GET_BUFFER
-                avctx->get_buffer ||
-#endif
-                avctx->get_buffer2 != avcodec_default_get_buffer2)))) {
+        (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
         return 0;
     }
     return 1;
@@ -982,11 +978,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
         return ff_get_buffer(avctx, f->f, flags);
 
     if (p->state != STATE_SETTING_UP &&
-        (avctx->codec->update_thread_context || (!avctx->thread_safe_callbacks && (
-#if FF_API_GET_BUFFER
-                avctx->get_buffer ||
-#endif
-                avctx->get_buffer2 != avcodec_default_get_buffer2)))) {
+        (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n");
         return -1;
     }