From 842689bbf632218eacfd84dfab2b83d6954bdc93 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 11 Jan 2014 01:28:18 +0100 Subject: sd_lavc: use mp_lavc_set_extradata() This includes the magical input padding required by libavcodec, which we possibly didn't do before this commit. --- sub/sd_lavc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index 5a328e3c5f..9f57d9ec38 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -103,8 +103,7 @@ static int init(struct sd *sd) ctx = avcodec_alloc_context3(sub_codec); if (!ctx) goto error; - ctx->extradata_size = sd->extradata_len; - ctx->extradata = sd->extradata; + mp_lavc_set_extradata(ctx, sd->extradata, sd->extradata_len); if (avcodec_open2(ctx, sub_codec, NULL) < 0) goto error; priv->avctx = ctx; @@ -264,6 +263,7 @@ static void uninit(struct sd *sd) clear(priv); avcodec_close(priv->avctx); + av_free(priv->avctx->extradata); av_free(priv->avctx); talloc_free(priv); } -- cgit v1.2.3