Merge commit '2caa93b813adc5dbb7771dfe615da826a2947d18'

[ffmpeg] / libavcodec / fmvc.c

diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c
index 9c452da351d6358d3735f2c233f3c0dffb9efb3b..1f8b0c5c17ca32edb89f4154a6b71ad2b868daf4 100644 (file)
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@ -380,18 +380,14 @@ static int decode_type1(GetByteContext *gb, PutByteContext *pb)
             bytestream2_put_byte(pb, bytestream2_get_byte(&gbc));
             bytestream2_put_byte(pb, bytestream2_get_byte(&gbc));
             bytestream2_put_byte(pb, bytestream2_get_byte(&gbc));
-            do {
-                bytestream2_put_byte(pb, bytestream2_get_byte(&gbc));
-                --len;
-            } while (len && bytestream2_get_bytes_left(&gbc) > 0);
         } else {
             bytestream2_put_le32(pb, bytestream2_get_le32(&gbc));
             len--;
-            do {
-                bytestream2_put_byte(pb, bytestream2_get_byte(&gbc));
-                len--;
-            } while (len && bytestream2_get_bytes_left(&gbc) > 0);
         }
+        do {
+            bytestream2_put_byte(pb, bytestream2_get_byte(&gbc));
+            len--;
+        } while (len && bytestream2_get_bytes_left(&gbc) > 0);
     }
 
     return 0;