Reverts the workaround in r823 and solves a macro bug.

The macro bug caused frames to be dropped after being grabbed
for decoding.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/248004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@831 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/video_coding/main/source/receiver.cc

@@ -254,6 +254,12 @@ VCMReceiver::FrameForDecoding(WebRtc_UWord16 maxWaitTimeMs,
         return NULL;
     }
 
+    if (frame == NULL && VCM_MIN(waitTimeMs, maxWaitTimeMs) == 0)
+    {
+        // No time to wait for a complete frame,
+        // check if we have an incomplete
+        frame = _jitterBuffer.GetFrameForDecoding();
+    }
     if (frame == NULL)
     {
         // Wait for a complete frame