Topright samples are always available.
Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavcodec/svq3.c | 11 ++---------
1 file 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 ||
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
