From c971220cdd360b56efc0e67536bdf19501477aa4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 31 Mar 2016 22:00:45 +0200
Subject: demux_lavf, ad_lavc, ad_spdif, vd_lavc: handle FFmpeg codecpar API
 change

AVFormatContext.codec is deprecated now, and you're supposed to use
AVFormatContext.codecpar instead.

Handle this for all of the normal playback code.

Encoding mode isn't touched.
---
 video/decode/vd_lavc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'video/decode/vd_lavc.c')

diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 478c6d56da..677d406989 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -444,8 +444,7 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
                    mp_imgfmt_to_name(c->codec_tag));
     }
 
-    if (c->lav_headers)
-        mp_copy_lav_codec_headers(avctx, c->lav_headers);
+    mp_set_lav_codec_headers(avctx, c);
 
     /* open it */
     if (avcodec_open2(avctx, lavc_codec, NULL) < 0)
-- 
cgit v1.2.3