[FFmpeg-cvslog] Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 13:20:25 2013 +0100| [9748cac5650a24d5b004a861649ab5a8274d5248] | committer: Michael Niedermayer

Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9748cac5650a24d5b004a861649ab5a8274d5248
---