From 3eceac2eab0b42ee082a0b615ebf40a21f0fb915 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 7 Dec 2016 19:44:29 +0100
Subject: Remove compatibility things

Possible with bumped FFmpeg/Libav.

These are just the simple cases.
---
 sub/lavc_conv.c | 3 ---
 sub/sd_lavc.c   | 5 -----
 2 files changed, 8 deletions(-)

(limited to 'sub')

diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c
index 3e0165a84c..3ff350c590 100644
--- a/sub/lavc_conv.c
+++ b/sub/lavc_conv.c
@@ -210,9 +210,6 @@ static int parse_webvtt(AVPacket *in, AVPacket *pkt)
 
     pkt->pts = in->pts;
     pkt->duration = in->duration;
-#if !HAVE_AV_AVPACKET_INT64_DURATION
-    pkt->convergence_duration = in->convergence_duration;
-#endif
     return 0;
 }
 
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 2c1b327b38..4ce8c5588c 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -263,13 +263,8 @@ static void read_sub_bitmaps(struct sd *sd, struct sub *sub)
         struct sub_bitmap *b = &sub->inbitmaps[i];
         struct pos pos = priv->packer->result[i];
         struct AVSubtitleRect *r = b->bitmap;
-#if HAVE_AV_SUBTITLE_NOPICT
         uint8_t **data = r->data;
         int *linesize = r->linesize;
-#else
-        uint8_t **data = r->pict.data;
-        int *linesize = r->pict.linesize;
-#endif
         b->w = r->w;
         b->h = r->h;
         b->x = r->x;
-- 
cgit v1.2.3