diff options
| author | Joakim Plate <elupus@ecce.se> | 2013-04-30 11:09:23 -0700 |
|---|---|---|
| committer | Joakim Plate <elupus@ecce.se> | 2013-04-30 11:09:23 -0700 |
| commit | 37c31a4795f5bb997a0d9a416aa0199d9fdc0e38 (patch) | |
| tree | 74f299448e79f7b13de294b8d73f2dc01836618e | |
| parent | ea1250e8120da9888ca7d1c94e3836069594f92f (diff) | |
| parent | 0066076ee4a26cc1a82414b584ca25fc8995cac9 (diff) | |
Merge pull request #2666 from FlyingRat/fix-PGS-subtitles
[dvdplayer] fixes PGS subtitles
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp index 7f7b304fdd..0eb1fcfa01 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp @@ -186,7 +186,8 @@ int CDVDOverlayCodecFFmpeg::Decode(DemuxPacket *pPacket) // for pgs subtitles the packet pts of the end_segments are wrong // instead use the subtitle pts to calc the offset here // see http://git.videolan.org/?p=ffmpeg.git;a=commit;h=2939e258f9d1fff89b3b68536beb931b54611585 - if (m_Subtitle.pts != DVD_NOPTS_VALUE) + + if (m_Subtitle.pts != AV_NOPTS_VALUE && pPacket->pts != DVD_NOPTS_VALUE) { pts_offset = m_Subtitle.pts - pPacket->pts ; } |