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)
* commit '36fab50e90d15352e403e4cc210890810f2fb4e2':
  asfdec: silence a warning
  mss4, ra288: Remove unused DSPContext local codec context members

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

Simple merge
Simple merge
Simple merge