diff options
| author | fritsch <Peter.Fruehberger@gmail.com> | 2016-03-29 22:28:18 +0200 |
|---|---|---|
| committer | fritsch <Peter.Fruehberger@gmail.com> | 2016-03-31 10:50:59 +0200 |
| commit | 4247f9b33093d871c4d2253751069ada8f155bbe (patch) | |
| tree | f86585efaeff37f76580f00e327f2bf74ff69f96 | |
| parent | 81f402d097de8a51c98c7281f50d37195d14f185 (diff) | |
FFmpeg 3.0 Transition: duration is int64_t now too - workaround can be dropped
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 |
1 files changed, 0 insertions, 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 |