Merge commit '8d918a98aa24134a043d578ef45bae363dbed9db'

[ffmpeg] / libavcodec / mpeg12.c

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 765a80dd2e1f5fe39e8e744b2f7085111c2e6cbd..7c140529ec8dc708c286941f5c759e14e745ddb4 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -248,8 +248,7 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size,
 int ff_mpeg1_decode_block_intra(GetBitContext *gb,
                                 const uint16_t *quant_matrix,
                                 uint8_t *const scantable, int last_dc[3],
-                                int16_t *block, int index, int qscale,
-                                int block_last_index[12])
+                                int16_t *block, int index, int qscale)
 {
     int dc, diff, i = 0, component;
     RLTable *rl = &ff_rl_mpeg1;
@@ -334,9 +333,8 @@ end:
         CLOSE_READER(re, gb);
     }
 
-       if (i > MAX_INDEX)
+    if (i > MAX_INDEX)
         i = AVERROR_INVALIDDATA;
 
-    block_last_index[index] = i;
-    return 0;
+    return i;
 }