[FFmpeg-cvslog] Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 12:14:08 2013 +0100| [0af4506e15a69209fe9d426226e107d24ee0e834] | committer: Michael Niedermayer

Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'

* commit '36fab50e90d15352e403e4cc210890810f2fb4e2':
  asfdec: silence a warning
  mss4, ra288: Remove unused DSPContext local codec context members

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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