Merge remote branch 'upstream-ro/master'

configure.in

@@ -173,7 +173,7 @@ AC_ARG_ENABLE([vtbdecoder],
 
 AC_ARG_ENABLE([openmax],
   [AS_HELP_STRING([--enable-openmax],
-  [enable OpenMax decoding (default is auto)])],
+  [enable OpenMax decoding (default is auto, requires OpenGLES)])],
   [use_openmax=$enableval],
   [use_openmax=auto])
 
@@ -883,6 +883,20 @@ if test "$use_external_ffmpeg" = "yes"; then
   AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
   AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
 
+  # Check if AVFilterBufferRefVideoProps AVRational member is named
+  # 'pixel_aspect' or 'sample_aspect_ratio'.
+  AC_CHECK_MEMBER([AVFilterBufferRefVideoProps.sample_aspect_ratio],
+    [AC_DEFINE([HAVE_AVFILTERBUFFERREFVIDEOPROPS_SAMPLE_ASPECT_RATIO],
+    [1],
+    [Define to 1 if AVFilterBufferRefVideoProps has member sample_aspect_ratio.])],
+      [AC_CHECK_MEMBER([AVFilterBufferRefVideoProps.sample_aspect_ratio],
+      [AC_DEFINE([HAVE_AVFILTERBUFFERREFVIDEOPROPS_SAMPLE_ASPECT_RATIO],
+      [1],
+      [Define to 1 if AVFilterBufferRefVideoProps has member sample_aspect_ratio.])],
+      ,
+      [[#include <ffmpeg/avfilter.h>]])],
+    [[#include <libavfilter/avfilter.h>]])
+
   AC_MSG_NOTICE($external_ffmpeg_enabled)
   USE_EXTERNAL_FFMPEG=1
   AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
@@ -1066,16 +1080,17 @@ if test "$host_vendor" = "apple" ; then
   USE_OPENMAX=0
   AC_MSG_NOTICE($openmax_disabled)
 else
-  if test "$use_openmax" = "auto"; then
+  if test "$use_gles" = "yes" && test "$use_openmax" = "auto"; then
     PKG_CHECK_MODULES([OPENMAX], [libomxil-bellagio],
                       USE_OPENMAX=1;[INCLUDES="$INCLUDES $OPENMAX_CFLAGS"; LIBS="$LIBS $OPENMAX_LIBS"],
                       use_openmax=no;USE_OPENMAX=0;AC_MSG_RESULT($openmax_not_found))
-  elif test "$use_openmax" = "yes"; then
+  elif test "$use_gles" = "yes" && test "$use_openmax" = "yes"; then
     PKG_CHECK_MODULES([OPENMAX], [libomxil-bellagio],
                       USE_OPENMAX=1;[INCLUDES="$INCLUDES $OPENMAX_CFLAGS"; LIBS="$LIBS $OPENMAX_LIBS"],
                       AC_MSG_ERROR($openmax_not_found))
   else
     AC_MSG_NOTICE($openmax_disabled)
+    use_openmax=no
     USE_OPENMAX=0
   fi
 fi

lib/asap/mads/Makefile

@@ -2,6 +2,8 @@ ARCH=i486-linux
 
 OBJS=mads.o
 
+CLEAN_FILES=mads
+
 all: mads.o
 
 mads.o: mads.pas

xbmc/FileItem.cpp

@@ -135,6 +135,7 @@ CFileItem::CFileItem(const CVideoInfoTag& movie)
     m_bIsFolder = false;
   }
   *GetVideoInfoTag() = movie;
+  if (movie.m_iSeason == 0) SetProperty("isspecial", "true");
   FillInDefaultIcon();
   SetCachedVideoThumb();
 }

xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp

@@ -570,7 +570,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture)
   /* use variable in the frame */
   AVRational pixel_aspect = m_pCodecContext->sample_aspect_ratio;
   if (m_pFilterLink)
-#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,4,0)
+#ifdef HAVE_AVFILTERBUFFERREFVIDEOPROPS_SAMPLE_ASPECT_RATIO
     pixel_aspect = m_pFilterLink->cur_buf->video->sample_aspect_ratio;
 #else
     pixel_aspect = m_pFilterLink->cur_buf->video->pixel_aspect;

xbmc/pictures/GUIWindowSlideShow.cpp

@@ -703,10 +703,10 @@ bool CGUIWindowSlideShow::OnMessage(CGUIMessage& message)
     }
     break;
     case GUI_MSG_PLAYBACK_STARTED:
-    {     
-      //only bring the fullscreen on front if we are not in a slideshow
-      if(!m_bSlideShow)
+    {
+      if(m_bSlideShow && m_bPlayingVideo)
         g_windowManager.ActivateWindow(WINDOW_FULLSCREEN_VIDEO);
+      m_bPlayingVideo = false;
     }
     break;
     case GUI_MSG_PLAYBACK_STOPPED:

xbmc/video/VideoDatabase.cpp

@@ -4628,6 +4628,7 @@ bool CVideoDatabase::GetSeasonsNav(const CStdString& strBaseDir, CFileItemList&
         pItem->SetProperty("numepisodes", it->second.numEpisodes); // will be changed later to reflect watchmode setting
         pItem->SetProperty("watchedepisodes", it->second.numWatched);
         pItem->SetProperty("unwatchedepisodes", it->second.numEpisodes - it->second.numWatched);
+        if (iSeason == 0) pItem->SetProperty("isspecial", "true");
         pItem->GetVideoInfoTag()->m_playCount = (it->second.numEpisodes == it->second.numWatched) ? 1 : 0;
         pItem->SetCachedSeasonThumb();
         pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED, (pItem->GetVideoInfoTag()->m_playCount > 0) && (pItem->GetVideoInfoTag()->m_iEpisode > 0));
@@ -4664,6 +4665,7 @@ bool CVideoDatabase::GetSeasonsNav(const CStdString& strBaseDir, CFileItemList&
         pItem->SetProperty("numepisodes", totalEpisodes); // will be changed later to reflect watchmode setting
         pItem->SetProperty("watchedepisodes", watchedEpisodes);
         pItem->SetProperty("unwatchedepisodes", totalEpisodes - watchedEpisodes);
+        if (iSeason == 0) pItem->SetProperty("isspecial", "true");
         pItem->GetVideoInfoTag()->m_playCount = (totalEpisodes == watchedEpisodes) ? 1 : 0;
         pItem->SetCachedSeasonThumb();
         pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED, (pItem->GetVideoInfoTag()->m_playCount > 0) && (pItem->GetVideoInfoTag()->m_iEpisode > 0));
@@ -5086,7 +5088,6 @@ bool CVideoDatabase::GetEpisodesByWhere(const CStdString& strBaseDir, const CStd
         pItem->m_strPath.Format("%s%ld/%ld/%ld",strBaseDir.c_str(), idShow, movie.m_iSeason,idEpisode);
       else
         pItem->m_strPath.Format("%s%ld",strBaseDir.c_str(), idEpisode);
-
       pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED,movie.m_playCount > 0);
       pItem->m_dateTime.SetFromDateString(movie.m_strFirstAired);
       pItem->GetVideoInfoTag()->m_iYear = pItem->m_dateTime.GetYear();