virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-10 12:14:08 +01:00
commit 0af4506e15
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mss4.c
View File

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

1
libavcodec/ra288.c
View File

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

2
libavformat/asfdec.c
View File

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