From d5702d3b958c967ecac4dec32bff75d723f7ece0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 6 Jul 2017 16:12:50 +0200
Subject: ad_lavc, vd_lavc, sd_lavc: consistently use avcodec_free_context()

Instead of various ad-hoc ways to achieve the same thing. (The API was
added only later.)
---
 video/decode/vd_lavc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'video/decode')

diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index e02da5ebda..e5de69499d 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -664,11 +664,7 @@ static void uninit_avctx(struct dec_video *vd)
     av_frame_free(&ctx->pic);
     av_buffer_unref(&ctx->cached_hw_frames_ctx);
 
-    if (ctx->avctx) {
-        if (avcodec_close(ctx->avctx) < 0)
-            MP_ERR(vd, "Could not close codec.\n");
-        av_freep(&ctx->avctx->extradata);
-    }
+    avcodec_free_context(&ctx->avctx);
 
     if (ctx->hwdec_dev && ctx->hwdec && ctx->hwdec->generic_hwaccel &&
         ctx->hwdec_dev->destroy)
-- 
cgit v1.2.3