summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/vmdav.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2005-04-19 05:16:45 +0000
committerMike Melanson <mike@multimedia.cx>2005-04-19 05:16:45 +0000
commit97c50cb77949856573d7f5f5a3c28cb73e61e011 (patch)
tree2dbabcbb9009b09d66789498ce1d2451a4b39bc0 /src/libffmpeg/libavcodec/vmdav.c
parent19e7199dad84489aa49e3b2dd5c0e45657ec0fb8 (diff)
downloadxine-lib-97c50cb77949856573d7f5f5a3c28cb73e61e011.tar.gz
xine-lib-97c50cb77949856573d7f5f5a3c28cb73e61e011.tar.bz2
sync to FFmpeg build 4752
CVS patchset: 7463 CVS date: 2005/04/19 05:16:45
Diffstat (limited to 'src/libffmpeg/libavcodec/vmdav.c')
-rw-r--r--src/libffmpeg/libavcodec/vmdav.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libffmpeg/libavcodec/vmdav.c b/src/libffmpeg/libavcodec/vmdav.c
index c11f80af6..4305f81fd 100644
--- a/src/libffmpeg/libavcodec/vmdav.c
+++ b/src/libffmpeg/libavcodec/vmdav.c
@@ -494,13 +494,10 @@ memset(data, 0x00, s->block_align * 2);
bytes_decoded = s->block_align * 2;
}
} else {
- if (s->bits == 16) {
- } else {
- /* copy the data but convert it to signed */
- for (i = 0; i < s->block_align; i++)
- data[i * 2 + 1] = buf[i] + 0x80;
- bytes_decoded = s->block_align * 2;
- }
+ /* copy the data but convert it to signed */
+ for (i = 0; i < s->block_align; i++)
+ data[i * 2 + 1] = buf[i] + 0x80;
+ bytes_decoded = s->block_align * 2;
}
}