[daala] Fixing problem with shadowed variables

[Timothy B. Terriberry]

Danesh Daroui wrote:
> Thanks for the feedback. Here comes a new patch attached. Hope that it
> is appropriate.

Can you squash the two commits, please?