Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:14:08 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:14:14 +0000 (12:14 +0100)
commit0af4506e15a69209fe9d426226e107d24ee0e834
tree248c83ba0b6c900449cc1cec7995eb65bad21132
parentf02f231e05e09f31cebd18f4a3c2c29753dc4608
parent36fab50e90d15352e403e4cc210890810f2fb4e2
Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mss4.c
libavcodec/ra288.c
libavformat/asfdec.c