[dvdplayer] fixes PGS subtitles

FlyingRat · FlyingRat · commit 0066076ee4a2 · 2013-04-30T13:33:59.000+02:00
diff --git 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 ;
     }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ int CDVDOverlayCodecFFmpeg::Decode(DemuxPacket *pPacket)`
`186`	`186`	`// for pgs subtitles the packet pts of the end_segments are wrong`
`187`	`187`	`// instead use the subtitle pts to calc the offset here`
`188`	`188`	`// see http://git.videolan.org/?p=ffmpeg.git;a=commit;h=2939e258f9d1fff89b3b68536beb931b54611585`
`189`		`- if (m_Subtitle.pts != DVD_NOPTS_VALUE)`
	`189`	`+`
	`190`	`+ if (m_Subtitle.pts != AV_NOPTS_VALUE && pPacket->pts != DVD_NOPTS_VALUE)`
`190`	`191`	`{`
`191`	`192`	`pts_offset = m_Subtitle.pts - pPacket->pts ;`
`192`	`193`	`}`