Merge commit '36fab50e'

* commit '36fab50e':
  asfdec: silence a warning
  mss4, ra288: Remove unused DSPContext local codec context members
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mss4.c

@@ -126,7 +126,6 @@ static const uint8_t mss4_vec_entry_vlc_syms[2][9] = {
 
 typedef struct MSS4Context {
     AVFrame    pic;
-    DSPContext dsp;
 
     VLC        dc_vlc[2], ac_vlc[2];
     VLC        vec_entry_vlc[2];

libavcodec/ra288.c

@@ -39,7 +39,6 @@
 
 typedef struct {
     AVFrame frame;
-    DSPContext dsp;
     AVFloatDSPContext fdsp;
     DECLARE_ALIGNED(32, float,   sp_lpc)[FFALIGN(36, 16)];   ///< LPC coefficients for speech data (spec: A)
     DECLARE_ALIGNED(32, float, gain_lpc)[FFALIGN(10, 16)];   ///< LPC coefficients for gain        (spec: GB)

libavformat/asfdec.c

@@ -108,7 +108,7 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
     if (!ff_guidcmp(g, &cmp)) \
         av_dlog(NULL, "(GUID: %s) ", # cmp)
 
-static void print_guid(const ff_asf_guid *g)
+static void print_guid(ff_asf_guid *g)
 {
     int i;
     PRINT_IF_GUID(g, ff_asf_header);