Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'

[ffmpeg] / libavcodec / vima.c

diff --git a/libavcodec/vima.c b/libavcodec/vima.c
index ceebb7691ddfd24c7e38e4591cd9ea9787a31e46..648ae5501652953de43d691310dd3146b0842ec7 100644 (file)
--- a/libavcodec/vima.c
+++ b/libavcodec/vima.c
@@ -1,5 +1,5 @@
 /*
- * LucasArt VIMA decoder
+ * LucasArts VIMA decoder
  * Copyright (c) 2012 Paul B Mahol
  *
  * This file is part of FFmpeg.
@@ -141,11 +141,11 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     int8_t         channel_hint[2];
     int            ret, chan, channels = 1;
 
-    init_get_bits(&gb, pkt->data, pkt->size * 8);
-
     if (pkt->size < 13)
         return AVERROR_INVALIDDATA;
 
+    init_get_bits(&gb, pkt->data, pkt->size * 8);
+
     samples = get_bits_long(&gb, 32);
     if (samples == 0xffffffff) {
         skip_bits_long(&gb, 32);