diff -Nru kodi-18.0+git20180917.0201-f7be5a2/BUILDDATE kodi-18.0+git20180918.0201-519b9c2/BUILDDATE --- kodi-18.0+git20180917.0201-f7be5a2/BUILDDATE 2018-09-17 00:01:47.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/BUILDDATE 2018-09-18 00:01:58.000000000 +0000 @@ -1 +1 @@ -20180917 +20180918 diff -Nru kodi-18.0+git20180917.0201-f7be5a2/debian/changelog kodi-18.0+git20180918.0201-519b9c2/debian/changelog --- kodi-18.0+git20180917.0201-f7be5a2/debian/changelog 2018-09-17 00:07:05.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/debian/changelog 2018-09-18 00:07:11.000000000 +0000 @@ -1,4 +1,23 @@ -kodi (2:18.0+git20180917.0201-f7be5a2-0xenial) xenial; urgency=high +kodi (2:18.0+git20180918.0201-519b9c2-0xenial) xenial; urgency=high + + [ace20022] + * [videoplayer] Fix crash if demuxffmpeg's AddStream method returns null. + + [Rainer Hochecker] + * VideoPlayer: fix edge case where input stream sets chunk size for live stream + + [Kai Sommerfeld] + * [PVR] CFileItem PVR ctors: No need to set label2; this will be done on demand by GUIMediaWindow which has the view data needed to set the correct values (e.g. long vs. short date format). - fixes trac#18020 + + [Garrett Brown] + * GUIWindowManager: Don't mess with RetroPlayer when activating windows + + [rim] + * WebDAV: Fix folder display names for WebDAV sources. "My%20Album" -> "My Album" + + [Ryan Rector] + * ActivateWindow return restore history only if same path + [Rechi] * [cleanup] yuv2rgb.neon isn't used since 241250b diff -Nru kodi-18.0+git20180917.0201-f7be5a2/debian/changelog.tmp kodi-18.0+git20180918.0201-519b9c2/debian/changelog.tmp --- kodi-18.0+git20180917.0201-f7be5a2/debian/changelog.tmp 2018-09-17 00:02:24.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/debian/changelog.tmp 2018-09-18 00:02:30.000000000 +0000 @@ -1,4 +1,23 @@ -kodi (2:18.0+git20180917.0201-f7be5a2-0dist) dist; urgency=high +kodi (2:18.0+git20180918.0201-519b9c2-0dist) dist; urgency=high + + [ace20022] + * [videoplayer] Fix crash if demuxffmpeg's AddStream method returns null. + + [Rainer Hochecker] + * VideoPlayer: fix edge case where input stream sets chunk size for live stream + + [Kai Sommerfeld] + * [PVR] CFileItem PVR ctors: No need to set label2; this will be done on demand by GUIMediaWindow which has the view data needed to set the correct values (e.g. long vs. short date format). - fixes trac#18020 + + [Garrett Brown] + * GUIWindowManager: Don't mess with RetroPlayer when activating windows + + [rim] + * WebDAV: Fix folder display names for WebDAV sources. "My%20Album" -> "My Album" + + [Ryan Rector] + * ActivateWindow return restore history only if same path + [Rechi] * [cleanup] yuv2rgb.neon isn't used since 241250b diff -Nru kodi-18.0+git20180917.0201-f7be5a2/debian/changelog.tmp.old kodi-18.0+git20180918.0201-519b9c2/debian/changelog.tmp.old --- kodi-18.0+git20180917.0201-f7be5a2/debian/changelog.tmp.old 2018-09-17 00:01:47.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/debian/changelog.tmp.old 2018-09-18 00:01:58.000000000 +0000 @@ -1,5 +1,15 @@ kodi (2:18.0+git20180719.0202-3231481-0dist) dist; urgency=high + [Rechi] + * [cleanup] yuv2rgb.neon isn't used since 241250b + + [Kai Sommerfeld] + * [keymaps] Map key 'numpad period' to action 'channel number separator'. + + [Kai Sommerfeld] + * [guiinfo] Fix Listitem.DBType not working for music videos. + + [peak3d] * [CURL] calculate download speed for libCurl version < 7.58.0 diff -Nru kodi-18.0+git20180917.0201-f7be5a2/VERSION kodi-18.0+git20180918.0201-519b9c2/VERSION --- kodi-18.0+git20180917.0201-f7be5a2/VERSION 2018-09-17 00:01:47.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/VERSION 2018-09-18 00:01:58.000000000 +0000 @@ -1 +1 @@ -f7be5a2 +519b9c2 diff -Nru kodi-18.0+git20180917.0201-f7be5a2/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp kodi-18.0+git20180918.0201-519b9c2/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp --- kodi-18.0+git20180917.0201-f7be5a2/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2018-09-10 10:08:09.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2018-09-18 00:01:30.000000000 +0000 @@ -269,20 +269,25 @@ } else { + bool seekable = true; + if (m_pInput->Seek(0, SEEK_POSSIBLE) == 0) + { + seekable = false; + } int bufferSize = 4096; int blockSize = m_pInput->GetBlockSize(); - if (blockSize > 1) + + if (blockSize > 1 && seekable) // non seakable input streams are not supposed to set block size bufferSize = blockSize; + unsigned char* buffer = (unsigned char*)av_malloc(bufferSize); m_ioContext = avio_alloc_context(buffer, bufferSize, 0, this, dvd_file_read, NULL, dvd_file_seek); - m_ioContext->max_packet_size = bufferSize; + if (blockSize > 1 && seekable) + m_ioContext->max_packet_size = bufferSize; - if (m_pInput->Seek(0, SEEK_POSSIBLE) == 0) - { + if (!seekable) m_ioContext->seekable = 0; - m_ioContext->max_packet_size = 0; - } std::string content = m_pInput->GetContent(); StringUtils::ToLower(content); @@ -1066,7 +1071,7 @@ // content has changed stream = AddStream(pPacket->iStreamId); } - if (stream->codec == AV_CODEC_ID_H264) + if (stream && stream->codec == AV_CODEC_ID_H264) pPacket->recoveryPoint = m_seekToKeyFrame; m_seekToKeyFrame = false; } diff -Nru kodi-18.0+git20180917.0201-f7be5a2/xbmc/FileItem.cpp kodi-18.0+git20180918.0201-519b9c2/xbmc/FileItem.cpp --- kodi-18.0+git20180917.0201-f7be5a2/xbmc/FileItem.cpp 2018-09-14 00:01:46.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/xbmc/FileItem.cpp 2018-09-18 00:01:30.000000000 +0000 @@ -145,7 +145,6 @@ m_epgInfoTag = tag; m_strPath = tag->Path(); SetLabel(tag->Title()); - m_strLabel2 = tag->Plot(); m_dateTime = tag->StartAsLocalTime(); if (!tag->Icon().empty()) @@ -167,9 +166,6 @@ m_bIsFolder = false; m_pvrChannelInfoTag = channel; SetLabel(channel->ChannelName()); - m_strLabel2 = epgNow ? epgNow->Title() : - CServiceBroker::GetSettings()->GetBool(CSettings::SETTING_EPG_HIDENOINFOAVAILABLE) ? - "" : g_localizeStrings.Get(19055); // no information available if (!channel->IconPath().empty()) SetIconImage(channel->IconPath()); @@ -195,7 +191,6 @@ m_strPath = record->m_strFileNameAndPath; SetLabel(record->m_strTitle); m_dateTime = record->RecordingTimeAsLocalTime(); - m_strLabel2 = m_dateTime.GetAsLocalizedDateTime(true, false); // Set art if (!record->m_strIconPath.empty()) @@ -221,7 +216,6 @@ m_pvrTimerInfoTag = timer; m_strPath = timer->Path(); SetLabel(timer->Title()); - m_strLabel2 = timer->Summary(); m_dateTime = timer->StartAsLocalTime(); if (!timer->ChannelIcon().empty()) diff -Nru kodi-18.0+git20180917.0201-f7be5a2/xbmc/filesystem/DAVDirectory.cpp kodi-18.0+git20180918.0201-519b9c2/xbmc/filesystem/DAVDirectory.cpp --- kodi-18.0+git20180917.0201-f7be5a2/xbmc/filesystem/DAVDirectory.cpp 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/xbmc/filesystem/DAVDirectory.cpp 2018-09-18 00:01:30.000000000 +0000 @@ -71,7 +71,7 @@ else if (CDAVCommon::ValueWithoutNamespace(pPropChild, "displayname") && !pPropChild->NoChildren()) { - item.SetLabel(pPropChild->FirstChild()->ValueStr()); + item.SetLabel(CURL::Decode(pPropChild->FirstChild()->ValueStr())); } else if (!item.m_dateTime.IsValid() && CDAVCommon::ValueWithoutNamespace(pPropChild, "creationdate") && !pPropChild->NoChildren()) diff -Nru kodi-18.0+git20180917.0201-f7be5a2/xbmc/guilib/GUIWindowManager.cpp kodi-18.0+git20180918.0201-519b9c2/xbmc/guilib/GUIWindowManager.cpp --- kodi-18.0+git20180917.0201-f7be5a2/xbmc/guilib/GUIWindowManager.cpp 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/xbmc/guilib/GUIWindowManager.cpp 2018-09-18 00:01:30.000000000 +0000 @@ -832,15 +832,6 @@ return; } - // pause game when leaving fullscreen or resume game when entering fullscreen - if (g_application.GetAppPlayer().IsPlayingGame()) - { - if (GetActiveWindow() == WINDOW_FULLSCREEN_GAME && !g_application.GetAppPlayer().IsPaused()) - g_application.OnAction(ACTION_PAUSE); - else if (iWindowID == WINDOW_FULLSCREEN_GAME && g_application.GetAppPlayer().IsPaused()) - g_application.OnAction(ACTION_PAUSE); - } - CServiceBroker::GetGUI()->GetInfoManager().GetInfoProviders().GetGUIControlsInfoProvider().SetNextWindow(iWindowID); // deactivate any window diff -Nru kodi-18.0+git20180917.0201-f7be5a2/xbmc/windows/GUIMediaWindow.cpp kodi-18.0+git20180918.0201-519b9c2/xbmc/windows/GUIMediaWindow.cpp --- kodi-18.0+git20180917.0201-f7be5a2/xbmc/windows/GUIMediaWindow.cpp 2018-09-13 00:02:00.000000000 +0000 +++ kodi-18.0+git20180918.0201-519b9c2/xbmc/windows/GUIMediaWindow.cpp 2018-09-18 00:01:30.000000000 +0000 @@ -520,7 +520,7 @@ // ensure our directory is valid dir = GetStartFolder(dir); bool resetHistory = false; - if (!returning || !m_history.IsInHistory(dir)) + if (!returning || !URIUtils::PathEquals(dir, m_startDirectory, true)) { // we're not returning to the same path, so set our directory to the requested path m_vecItems->SetPath(dir); resetHistory = true;