diff options
author | wm4 <wm4@nowhere> | 2016-12-07 19:44:29 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-12-07 19:53:11 +0100 |
commit | 3eceac2eab0b42ee082a0b615ebf40a21f0fb915 (patch) | |
tree | a7f719897b49f44006d44a1efcdab3b8d203aad8 /sub | |
parent | a660e15c9b96bd46209e78b3c3d4cf136a039a50 (diff) | |
download | mpv-3eceac2eab0b42ee082a0b615ebf40a21f0fb915.tar.bz2 mpv-3eceac2eab0b42ee082a0b615ebf40a21f0fb915.tar.xz |
Remove compatibility things
Possible with bumped FFmpeg/Libav.
These are just the simple cases.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/lavc_conv.c | 3 | ||||
-rw-r--r-- | sub/sd_lavc.c | 5 |
2 files changed, 0 insertions, 8 deletions
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; |