fix ac3 and dts detection (patch by Joakim Plate <joakim.plate at ecce.se>)

[ffmpeg] / libavcodec / vmdav.c

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index c09af13697e7cac628036d20b1160bdd61be56f4..4305f81fdad26a9979ed974c4cc00a231513b088 100644 (file)
--- a/libavcodec/vmdav.c
+++ b/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;
         }
     }
 
@@ -522,7 +519,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);