Merge pull request #1474 from theuni/player-caps
authorCory Fields <foss@atlastechnologiesinc.com>
Wed, 10 Oct 2012 02:18:10 +0000 (19:18 -0700)
committerCory Fields <foss@atlastechnologiesinc.com>
Wed, 10 Oct 2012 02:18:10 +0000 (19:18 -0700)
Player capability flags

1  2 
xbmc/cores/IPlayer.h
xbmc/cores/amlplayer/AMLPlayer.cpp

Simple merge
  #include "xbmc/cores/dvdplayer/DVDClock.h"
  #include "xbmc/cores/dvdplayer/DVDPlayerSubtitle.h"
  #include "xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h"
+ #include "settings/VideoSettings.h"
  
  // amlogic libplayer
 +#include "AMLUtils.h"
  #include "DllLibamplayer.h"
  
  struct AMLChapterInfo