summaryrefslogtreecommitdiff
path: root/libavcodec/mss2.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-30 16:12:15 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-06 17:41:26 +0100
commit835be33ee30f872f6e400cba7bae14d8a1e5f89a (patch)
treec6b3d48980b91cb66bc07782577e4da2f2a81648 /libavcodec/mss2.c
parent5a157313b3860887947b6fe51d313aa4d397d3a0 (diff)
avcodec/vc1dec: Factor (re)initializing code out
This is in preparation for removing the msmpeg4 dependency from VC-1. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/mss2.c')
-rw-r--r--libavcodec/mss2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index 14746505f4..2469718c8f 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -29,7 +29,6 @@
#include "error_resilience.h"
#include "mpeg_er.h"
#include "mpegvideodec.h"
-#include "msmpeg4dec.h"
#include "qpeldsp.h"
#include "vc1.h"
#include "wmv2data.h"
@@ -852,8 +851,8 @@ static av_cold int wmv9_init(AVCodecContext *avctx)
ff_vc1_init_transposed_scantables(v);
- if ((ret = ff_msmpeg4_decode_init(avctx)) < 0 ||
- (ret = ff_vc1_decode_init_alloc_tables(v)) < 0)
+ ret = ff_vc1_decode_init(avctx);
+ if (ret < 0)
return ret;
/* error concealment */