Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'

* commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604':
  mpeg12dec: Always close reader on error

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/mpeg12dec.c
index cc8ace8e3a3afa7846324cfb44c9f277df0d5d81,882fdf3d825643daba94364ac1873a8b84c68379..4e6e4a2133219f3009a592f94951fc18360f04c6
--- 1/libavcodec/mpeg12dec.c
--- 2/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@@ -165,9 -166,13 +166,10 @@@ static inline int mpeg1_decode_block_in
              GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0],
                         TEX_VLC_BITS, 2, 0);
  
 -            if (level == 127) {
 -                break;
 -            } else if (level != 0) {
 +            if (level != 0) {
                  i += run;
-                 check_scantable_index(s, i);
+                 if (i > MAX_INDEX)
+                     break;
                  j = scantable[i];
                  level = (level * qscale * quant_matrix[j]) >> 4;
                  level = (level - 1) | 1;
@@@ -183,13 -188,14 +185,14 @@@
                  SKIP_BITS(re, &s->gb, 8);
                  if (level == -128) {
                      level = SHOW_UBITS(re, &s->gb, 8) - 256;
 -                    LAST_SKIP_BITS(re, &s->gb, 8);
 +                    SKIP_BITS(re, &s->gb, 8);
                  } else if (level == 0) {
                      level = SHOW_UBITS(re, &s->gb, 8);
 -                    LAST_SKIP_BITS(re, &s->gb, 8);
 +                    SKIP_BITS(re, &s->gb, 8);
                  }
                  i += run;
-                 check_scantable_index(s, i);
+                 if (i > MAX_INDEX)
+                     break;
                  j = scantable[i];
                  if (level < 0) {
                      level = -level;
@@@ -203,15 -209,12 +206,18 @@@
              }
  
              block[j] = level;
 +            if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF)
 +               break;
 +
 +            UPDATE_CACHE(re, &s->gb);
          }
 +end:
 +        LAST_SKIP_BITS(re, &s->gb, 2);
          CLOSE_READER(re, &s->gb);
      }
+ 
+     check_scantable_index(s, i);
+ 
      s->block_last_index[n] = i;
      return 0;
  }