Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(840)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patched-ffmpeg-mt/libavcodec/nellymoserdec.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavcodec/msrledec.c ('k') | patched-ffmpeg-mt/libavcodec/nellymoserenc.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patched-ffmpeg-mt/libavcodec/nellymoserdec.c
===================================================================
--- patched-ffmpeg-mt/libavcodec/nellymoserdec.c (revision 41250)
+++ patched-ffmpeg-mt/libavcodec/nellymoserdec.c (working copy)
@@ -36,6 +36,7 @@
#include "libavutil/random_seed.h"
#include "avcodec.h"
#include "dsputil.h"
+#include "fft.h"
#define ALT_BITSTREAM_READER_LE
#include "get_bits.h"
@@ -43,7 +44,7 @@
typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx;
- DECLARE_ALIGNED_16(float,float_buf)[NELLY_SAMPLES];
+ DECLARE_ALIGNED(16, float,float_buf)[NELLY_SAMPLES];
float state[128];
AVLFG random_state;
GetBitContext gb;
@@ -51,7 +52,7 @@
float scale_bias;
DSPContext dsp;
FFTContext imdct_ctx;
- DECLARE_ALIGNED_16(float,imdct_out)[NELLY_BUF_LEN * 2];
+ DECLARE_ALIGNED(16, float,imdct_out)[NELLY_BUF_LEN * 2];
} NellyMoserDecodeContext;
static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in)
« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavcodec/msrledec.c ('k') | patched-ffmpeg-mt/libavcodec/nellymoserenc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698