Skip to content
Browse files

Don't utilize rect.flags for an external ffmpeg that doesn't support it

Modifies the PGS Forced Subtitles Fix recently merged under the commit
below so that users who can't upgrade their external ffmeg don't utilize
the new objects.

e6f195c
  • Loading branch information...
1 parent dc8f921 commit 1ecc756cc285b6adaafc7530bcda8ba417a30bc3 @GreenOnyx GreenOnyx committed
Showing with 4 additions and 1 deletion.
  1. +4 −1 xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
View
5 xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
@@ -259,7 +259,10 @@ CDVDOverlay* CDVDOverlayCodecFFmpeg::GetOverlay()
overlay->y = rect.y;
overlay->width = rect.w;
overlay->height = rect.h;
- overlay->bForced = rect.flags;
+
+#if (!defined USE_EXTERNAL_FFMPEG) || (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,71,100))
+ overlay->bForced = rect.flags != 0;
+#endif
int right = overlay->x + overlay->width;
int bottom = overlay->y + overlay->height;

0 comments on commit 1ecc756

Please sign in to comment.
Something went wrong with that request. Please try again.