Merge remote branch 'upstream/master'

diff --cc XBMC.xcodeproj/project.pbxproj
index 5fb1cef,2bf8758..e6fd8da
--- 1/XBMC.xcodeproj/project.pbxproj
--- 2/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@@ -8276,38 -8112,11 +8294,41 @@@
                                F5E728A51227112500B152C1 /* URIUtils.cpp in Sources */,
                                7CF1FB0C123B1AF000B2CBCB /* Variant.cpp in Sources */,
                                C8D0B2AF1265A9A800F0C0AC /* SystemGlobals.cpp in Sources */,
 +                              832F2C46120D8B5E00026B38 /* PVRManager.cpp in Sources */,
 +                              832F2C4F120D8B7F00026B38 /* PVRChannels.cpp in Sources */,
 +                              832F2C50120D8B7F00026B38 /* PVREpg.cpp in Sources */,
 +                              832F2C51120D8B7F00026B38 /* PVRRecordings.cpp in Sources */,
 +                              832F2C52120D8B7F00026B38 /* PVRTimers.cpp in Sources */,
 +                              832F2C69120D8BA900026B38 /* GUIDialogPVRChannelManager.cpp in Sources */,
 +                              832F2C6A120D8BA900026B38 /* GUIDialogPVRChannelsOSD.cpp in Sources */,
 +                              832F2C6B120D8BA900026B38 /* GUIDialogPVRCutterOSD.cpp in Sources */,
 +                              832F2C6C120D8BA900026B38 /* GUIDialogPVRDirectorOSD.cpp in Sources */,
 +                              832F2C6D120D8BA900026B38 /* GUIDialogPVRGroupManager.cpp in Sources */,
 +                              832F2C6E120D8BA900026B38 /* GUIDialogPVRGuideInfo.cpp in Sources */,
 +                              832F2C6F120D8BA900026B38 /* GUIDialogPVRGuideOSD.cpp in Sources */,
 +                              832F2C70120D8BA900026B38 /* GUIDialogPVRGuideSearch.cpp in Sources */,
 +                              832F2C71120D8BA900026B38 /* GUIDialogPVRRecordingInfo.cpp in Sources */,
 +                              832F2C72120D8BA900026B38 /* GUIDialogPVRTimerSettings.cpp in Sources */,
 +                              832F2C73120D8BA900026B38 /* GUIDialogPVRUpdateProgressBar.cpp in Sources */,
 +                              832F2C7E120D8C0300026B38 /* AddonHelpers_Addon.cpp in Sources */,
 +                              832F2C7F120D8C0300026B38 /* AddonHelpers_GUI.cpp in Sources */,
 +                              832F2C80120D8C0300026B38 /* AddonHelpers_local.cpp in Sources */,
 +                              832F2C81120D8C0300026B38 /* AddonHelpers_PVR.cpp in Sources */,
 +                              832F2C84120D8C1000026B38 /* PVRClient.cpp in Sources */,
 +                              832F2C87120D8C5300026B38 /* TVDatabase.cpp in Sources */,
 +                              832F2C8A120D8C9300026B38 /* GUIEPGGridContainer.cpp in Sources */,
 +                              832F2C8F120D8CB500026B38 /* PVRDirectory.cpp in Sources */,
 +                              832F2C90120D8CB500026B38 /* PVRFile.cpp in Sources */,
 +                              832F2C95120D8CF600026B38 /* TextSearch.cpp in Sources */,
 +                              832F2C98120D8D0B00026B38 /* DVDDemuxPVRClient.cpp in Sources */,
 +                              832F2C9B120D8D3000026B38 /* GUIWindowTV.cpp in Sources */,
 +                              832F2CA0120D8D5C00026B38 /* DVDInputStreamPVRManager.cpp in Sources */,
 +                              832F2CA3120D8D7600026B38 /* GUIViewStateTV.cpp in Sources */,
                                7CBEBB8412912BA400431822 /* fstrcmp.c in Sources */,
                                184C472F1296BC6E0006DB3E /* Service.cpp in Sources */,
+                               F57A83E912D3C713000525C5 /* FileUDF.cpp in Sources */,
+                               F57A83F812D3C764000525C5 /* UDFDirectory.cpp in Sources */,
+                               F57A840112D3C775000525C5 /* udf25.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --cc xbmc/FileSystem/FactoryDirectory.cpp
Simple merge

diff --cc xbmc/FileSystem/FileFactory.cpp
Simple merge

diff --cc xbmc/FileSystem/Makefile.in
Simple merge

diff --cc xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
index 4eff9c0,5fbf33a..320ad9c
--- 1/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
--- 2/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
@@@ -56,10 -55,8 +56,10 @@@ CDVDInputStream* CDVDFactoryInputStream
    {
      return (new CDVDInputStreamNavigator(pPlayer));
    }
 +  else if(file.substr(0, 6) == "pvr://")
 +    return new CDVDInputStreamPVRManager(pPlayer);
  #ifdef HAVE_LIBBLURAY
-   else if (item.IsType(".bdmv") || item.IsType(".mpls"))
+   else if (item.IsType(".bdmv") || item.IsType(".mpls") || content == "bluray/iso")
      return new CDVDInputStreamBluray();
  #endif
    else if(file.substr(0, 6) == "rtp://"

diff --cc xbmc/cores/dvdplayer/DVDPlayer.cpp
Simple merge