X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Flibvpx%2Fsource%2Flibvpx%2Fvp9%2Fdecoder%2Fvp9_dthread.c;h=69e4fde85860a604b6bc2044f542d7bf58440098;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=62ea6c14d250c9ab38245d62b13159fdff91fa21;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/libvpx/source/libvpx/vp9/decoder/vp9_dthread.c b/src/third_party/libvpx/source/libvpx/vp9/decoder/vp9_dthread.c
index 62ea6c1..69e4fde 100644
--- a/src/third_party/libvpx/source/libvpx/vp9/decoder/vp9_dthread.c
+++ b/src/third_party/libvpx/source/libvpx/vp9/decoder/vp9_dthread.c
@@ -223,14 +223,18 @@ void vp9_loop_filter_alloc(VP9LfSync *lf_sync, VP9_COMMON *cm, int rows,
 
     CHECK_MEM_ERROR(cm, lf_sync->mutex_,
                     vpx_malloc(sizeof(*lf_sync->mutex_) * rows));
-    for (i = 0; i < rows; ++i) {
-      pthread_mutex_init(&lf_sync->mutex_[i], NULL);
+    if (lf_sync->mutex_) {
+      for (i = 0; i < rows; ++i) {
+        pthread_mutex_init(&lf_sync->mutex_[i], NULL);
+      }
     }
 
     CHECK_MEM_ERROR(cm, lf_sync->cond_,
                     vpx_malloc(sizeof(*lf_sync->cond_) * rows));
-    for (i = 0; i < rows; ++i) {
-      pthread_cond_init(&lf_sync->cond_[i], NULL);
+    if (lf_sync->cond_) {
+      for (i = 0; i < rows; ++i) {
+        pthread_cond_init(&lf_sync->cond_[i], NULL);
+      }
     }
   }
 #endif  // CONFIG_MULTITHREAD