From 4247f9b33093d871c4d2253751069ada8f155bbe Mon Sep 17 00:00:00 2001 From: fritsch Date: Tue, 29 Mar 2016 22:28:18 +0200 Subject: FFmpeg 3.0 Transition: duration is int64_t now too - workaround can be dropped --- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 7f5e8a7130..5271e4bcbc 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -817,10 +817,6 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() m_pkt.pkt.pts = AV_NOPTS_VALUE; } - // we need to get duration slightly different for matroska embedded text subtitels - if(m_bMatroska && stream->codec && stream->codec->codec_id == AV_CODEC_ID_TEXT && m_pkt.pkt.convergence_duration != 0) - m_pkt.pkt.duration = m_pkt.pkt.convergence_duration; - if(m_bAVI && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_VIDEO) { // AVI's always have borked pts, specially if m_pFormatContext->flags includes -- cgit v1.2.3