diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-12-25 13:28:05 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-12-25 13:28:05 +0100 |
| commit | b3d670a3e1ee9c60be33b6e5fafdf3b6449b5762 (patch) | |
| tree | 341f80d55bf200c6bb195f77ce50a2fd1f030345 /sub/lavc_conv.c | |
| parent | 1d4273cfb52043c8165b85e9d7ac7bc14cb59cba (diff) | |
| parent | 1c761bd6f59c369e45037e80f781429da65734c3 (diff) | |
| download | mpv-b3d670a3e1ee9c60be33b6e5fafdf3b6449b5762.tar.bz2 mpv-b3d670a3e1ee9c60be33b6e5fafdf3b6449b5762.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/lavc_conv.c')
| -rw-r--r-- | sub/lavc_conv.c | 3 |
1 files changed, 0 insertions, 3 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; } |