Unified · Split
| @@ -395,7 +395,7 @@ static inline int get_dmv(MpegEncContext *s) · 394 unmodified lines | |||
| 395 | #define MT_16X8 2 | 395 | #define MT_16X8 2 |
| 396 | #define MT_DMV 3 | 396 | #define MT_DMV 3 |
| 397 | 397 | ||
| 398 | static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) | 398 | static int mpeg_decode_mb(MPVContext *const s) |
| 399 | { | 399 | { |
| 400 | int i, j, k, cbp, val, mb_type, motion_type; | 400 | int i, j, k, cbp, val, mb_type, motion_type; |
| 401 | const int mb_block_count = 4 + (1 << s->chroma_format); | 401 | const int mb_block_count = 4 + (1 << s->chroma_format); |
| @@ -1449,7 +1449,8 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, · 1047 unmodified lines | |||
| 1449 | } | 1449 | } |
| 1450 | 1450 | ||
| 1451 | for (;;) { | 1451 | for (;;) { |
| 1452 | if ((ret = mpeg_decode_mb(s, s->block)) < 0) | 1452 | ret = mpeg_decode_mb(s); |
| 1453 | if (ret < 0) | ||
| 1453 | return ret; | 1454 | return ret; |
| 1454 | 1455 | ||
| 1455 | // Note motion_val is normally NULL unless we want to extract the MVs. | 1456 | // Note motion_val is normally NULL unless we want to extract the MVs. |