diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 12:14:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 12:14:14 +0100 |
| commit | 0af4506e15a69209fe9d426226e107d24ee0e834 (patch) | |
| tree | 248c83ba0b6c900449cc1cec7995eb65bad21132 | |
| parent | f02f231e05e09f31cebd18f4a3c2c29753dc4608 (diff) | |
| parent | 36fab50e90d15352e403e4cc210890810f2fb4e2 (diff) | |
| download | ffmpeg-0af4506e15a69209fe9d426226e107d24ee0e834.tar.gz | |
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>
| -rw-r--r-- | libavcodec/mss4.c | 1 | ||||
| -rw-r--r-- | libavcodec/ra288.c | 1 | ||||
| -rw-r--r-- | libavformat/asfdec.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index f575387e6e..977e1e5552 100644 --- a/libavcodec/mss4.c +++ b/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]; diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index e0e876dbd9..cb6eadba7d 100644 --- a/libavcodec/ra288.c +++ b/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) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 136b6d6955..507e5c0117 100644 --- a/libavformat/asfdec.c +++ b/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); |