diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-10 13:21:08 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-13 08:26:13 +0100 |
| commit | 67cccd442f73d8eea54660b552fe954c642f060c (patch) | |
| tree | 9ed2fa23da78cef6dd1c40e0aa8603fcef02ad75 | |
| parent | 42d30c9019a6b67c56b05f1828fa04c0439a4fd0 (diff) | |
| download | ffmpeg-67cccd442f73d8eea54660b552fe954c642f060c.tar.gz | |
avcodec/svq3: Remove dead topright_samples_available variable, code
Topright samples are always available.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/svq3.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 6f3ade8ace..a3f434ff8d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -128,7 +128,6 @@ typedef struct SVQ3Context { int8_t (*intra4x4_pred_mode); unsigned int top_samples_available; - unsigned int topright_samples_available; unsigned int left_samples_available; uint8_t *edge_emu_buffer; @@ -638,15 +637,10 @@ static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s, const int dir = s->intra4x4_pred_mode_cache[scan8[i]]; uint8_t *topright; - int nnz, tr; + int nnz; if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) { - const int topright_avail = (s->topright_samples_available << i) & 0x8000; av_assert2(s->mb_y || linesize <= block_offset[i]); - if (!topright_avail) { - tr = ptr[3 - linesize] * 0x01010101u; - topright = (uint8_t *)&tr; - } else - topright = ptr + 4 - linesize; + topright = ptr + 4 - linesize; } else topright = NULL; @@ -721,7 +715,6 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) s->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; s->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; - s->topright_samples_available = 0xFFFF; if (mb_type == 0) { /* SKIP */ if (s->pict_type == AV_PICTURE_TYPE_P || |