[libav-devel] [PATCH 18/20] shorten: do not use block size to determine whether to read the header.

[Justin Ruggles]

---
 libavcodec/shorten.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 7fdd86c..357512f 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -102,6 +102,7 @@ typedef struct ShortenContext {
     int blocksize;
     int bitindex;
     int32_t lpcqoffset;
+    int got_header;
 } ShortenContext;
 
 static av_cold int shorten_decode_init(AVCodecContext * avctx)
@@ -386,6 +387,8 @@ static int read_header(ShortenContext *s)
     s->cur_chan = 0;
     s->bitshift = 0;
 
+    s->got_header = 1;
+
     return 0;
 }
 
@@ -438,8 +441,7 @@ static int shorten_decode_frame(AVCodecContext *avctx,
     skip_bits(&s->gb, s->bitindex);
 
     /* process header or next subblock */
-    if (!s->blocksize)
-    {
+    if (!s->got_header) {
         if ((ret = read_header(s)) < 0)
             return ret;
     }
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel