[FFmpeg-soc] [soc] Use USE_FRAME_THREADING instead of checking for thread_opaque, since it might be the wrong type.

[Alexander Strange]

---
 libavcodec/framethread.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/framethread.c b/libavcodec/framethread.c
index c1a338c..2189291 100644
--- a/libavcodec/framethread.c
+++ b/libavcodec/framethread.c
@@ -193,7 +193,7 @@ void ff_report_decode_progress(AVFrame *f, int n) {
     PerThreadContext *p = f->avctx->thread_opaque;
     int *progress = f->thread_opaque;
 
-    if (!p) {*progress = n; return;}
+    if (!USE_FRAME_THREADING(f->avctx)) {*progress = n; return;}
 
     pthread_mutex_lock(&p->progress_mutex);
     *progress = n;
@@ -216,7 +216,7 @@ void ff_await_decode_progress(AVFrame *f, int n) {
 void ff_report_predecode_done(AVCodecContext *avctx) {
     PerThreadContext *p = avctx->thread_opaque;
 
-    if (!p) return;
+    if (!USE_FRAME_THREADING(avctx)) return;
 
     pthread_mutex_lock(&p->progress_mutex);
     p->state = STATE_DECODING;
@@ -359,7 +359,7 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *f)
     f->thread_opaque = progress = av_malloc(sizeof(int));
     *progress = -1;
 
-    if (!p) {
+    if (!USE_FRAME_THREADING(avctx)) {
         return avctx->get_buffer(avctx, f);
     }
 
@@ -376,7 +376,7 @@ void ff_release_buffer(AVFrame *f)
 
     av_freep(&f->thread_opaque);
 
-    if (!p) {
+    if (!USE_FRAME_THREADING(f->avctx)) {
         f->avctx->release_buffer(f->avctx, f);
         return;
     }

_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc