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
2 files changed