summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mdct.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-08 13:18:42 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-08 13:18:42 +0000
commit6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea (patch)
treee70be493d1222b10f96aa5efac01c0ec0d5bcc97 /src/libffmpeg/libavcodec/mdct.c
parent1fb58a63872660424777d41389e426dc90f1b660 (diff)
downloadxine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.gz
xine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.bz2
syncing ffmpeg (with some compilation fixes)
- fixes wma bugs - mace, huffyuv and mp3 decoders imported (but not enabled) tested: wma (v1 and v2), mpeg4, msmpeg4 v1, v2 and v3, divx3, divx4, divx5, xvid and dv decoders. everything looks fine. CVS patchset: 3828 CVS date: 2003/01/08 13:18:42
Diffstat (limited to 'src/libffmpeg/libavcodec/mdct.c')
-rw-r--r--src/libffmpeg/libavcodec/mdct.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/mdct.c b/src/libffmpeg/libavcodec/mdct.c
index 0f70ed850..91a927cb0 100644
--- a/src/libffmpeg/libavcodec/mdct.c
+++ b/src/libffmpeg/libavcodec/mdct.c
@@ -31,10 +31,10 @@ int ff_mdct_init(MDCTContext *s, int nbits, int inverse)
s->nbits = nbits;
s->n = n;
n4 = n >> 2;
- s->tcos = malloc(n4 * sizeof(FFTSample));
+ s->tcos = av_malloc(n4 * sizeof(FFTSample));
if (!s->tcos)
goto fail;
- s->tsin = malloc(n4 * sizeof(FFTSample));
+ s->tsin = av_malloc(n4 * sizeof(FFTSample));
if (!s->tsin)
goto fail;