The branch, master has been updated
via fc2c030fb2b24582730ccf0e81631b297408fb94 (commit)
via a44f7b6c4fb7d8357adc6a0326339db2793a0b56 (commit)
from b91081274f5a5b5f0f1ce820331f702378a425e8 (commit)
- Log -----------------------------------------------------------------
commit fc2c030fb2b24582730ccf0e81631b297408fb94
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Wed Oct 29 15:59:17 2025 +0100
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sat Nov 1 15:47:45 2025 +0100
avcodec/vc1dec: Deduplicate cleanup code
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 35d8c68f45..1925384ba5 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -1366,12 +1366,7 @@ image:
}
end:
- av_free(buf2);
- for (i = 0; i < n_slices; i++)
- av_free(slices[i].buf);
- av_free(slices);
- return buf_size;
-
+ ret = buf_size;
err:
av_free(buf2);
for (i = 0; i < n_slices; i++)
commit a44f7b6c4fb7d8357adc6a0326339db2793a0b56
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Wed Oct 29 15:47:47 2025 +0100
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sat Nov 1 15:47:45 2025 +0100
avcodec/vc1dec: Don't initialize write-only intra_scantable
VC-1 does not use it.
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 55225baec9..35d8c68f45 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -468,9 +468,6 @@ av_cold int ff_vc1_decode_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
- ff_permute_scantable(s->intra_scantable.permutated, ff_wmv1_scantable[1],
- s->idsp.idct_permutation);
-
ret = vc1_decode_init_alloc_tables(v);
if (ret < 0) {
vc1_decode_reset(avctx);
-----------------------------------------------------------------------
Summary of changes:
libavcodec/vc1dec.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
