commit 0581cb268102b3b07009950fbdb9da16dee7361c
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 01 13:59:02 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 01 13:59:02 2011 -0700
tree 6e6126c3b2b286e80b7124237b581801ae35c84f
parent c1cf37d14599c6a27355432ccfd5d4e724dab2a4
parent 46b0fc9b2de86241489d9d97c8f40d2e89527d29

am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."

* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.

include/utils/RefBase.h

diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h
index d92cfb0..0af7e6a 100644
--- a/include/utils/RefBase.h
+++ b/include/utils/RefBase.h
@@ -115,6 +115,7 @@
     // used to override the RefBase destruction.
     class Destroyer {
         friend class RefBase;
+        friend class weakref_type;
     public:
         virtual ~Destroyer();
     private: