Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:20:25 +0000 (13:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:24:43 +0000 (13:24 +0100)
* commit '4f3b058c84f570e261d743c7c22f865617fd28ac':
  cavs: initialize various context tables to 0
  mlpdec: do not try to allocate a zero-sized output buffer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mlpdec.c

Simple merge