summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mace.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-16 00:18:35 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-16 00:18:35 +0000
commit1d0821178b1c27e35595f72bd9adda5945c7be8b (patch)
tree217e2a8eb9c63b36c22f90486752b09fc9aa00ea /src/libffmpeg/libavcodec/mace.c
parented5ec90442b4dda3918372b43072205fb4ea6167 (diff)
downloadxine-lib-1d0821178b1c27e35595f72bd9adda5945c7be8b.tar.gz
xine-lib-1d0821178b1c27e35595f72bd9adda5945c7be8b.tar.bz2
ffmpeg update, add new files/decoders, use our fastmemcpy
tested ok with usual files (wmv7, mpeg4, divx, svq1...) CVS patchset: 4618 CVS date: 2003/04/16 00:18:35
Diffstat (limited to 'src/libffmpeg/libavcodec/mace.c')
-rw-r--r--src/libffmpeg/libavcodec/mace.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/mace.c b/src/libffmpeg/libavcodec/mace.c
index 91a37452b..1beac6c40 100644
--- a/src/libffmpeg/libavcodec/mace.c
+++ b/src/libffmpeg/libavcodec/mace.c
@@ -403,14 +403,18 @@ static int mace_decode_frame(AVCodecContext *avctx,
samples = (short *)data;
switch (avctx->codec->id) {
case CODEC_ID_MACE3:
+#ifdef DEBUG
puts("mace_decode_frame[3]()");
+#endif
Exp1to3(c, buf, samples, buf_size / 2, avctx->channels, 1);
if (avctx->channels == 2)
Exp1to3(c, buf, samples+1, buf_size / 2, 2, 2);
*data_size = 2 * 3 * buf_size;
break;
case CODEC_ID_MACE6:
+#ifdef DEBUG
puts("mace_decode_frame[6]()");
+#endif
Exp1to6(c, buf, samples, buf_size, avctx->channels, 1);
if (avctx->channels == 2)
Exp1to6(c, buf, samples+1, buf_size, 2, 2);