summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/vmdav.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-05-30 19:24:17 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-05-30 19:24:17 +0000
commitdf5fbeb013e70f14090cec1998a5f923d6713a1d (patch)
treede31c29919f53b88f27bdb7add18706b1b51ddcc /src/libffmpeg/libavcodec/vmdav.c
parent26de73d1e48ab23af83e352cdc6e9eac41bf8c3b (diff)
downloadxine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.gz
xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.bz2
merge ffmpeg to fix compiler warnings
CVS patchset: 6612 CVS date: 2004/05/30 19:24:17
Diffstat (limited to 'src/libffmpeg/libavcodec/vmdav.c')
-rw-r--r--src/libffmpeg/libavcodec/vmdav.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/vmdav.c b/src/libffmpeg/libavcodec/vmdav.c
index c09af1369..c11f80af6 100644
--- a/src/libffmpeg/libavcodec/vmdav.c
+++ b/src/libffmpeg/libavcodec/vmdav.c
@@ -522,7 +522,6 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
if (buf_size < 16)
return buf_size;
- *data_size = 0;
if (buf[6] == 1) {
/* the chunk contains audio */
*data_size = vmdaudio_loadsound(s, output_samples, p, 0);