aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Pfau <pfau@peak3d.de>2018-11-16 22:05:05 +0100
committerGitHub <noreply@github.com>2018-11-16 22:05:05 +0100
commit5bcc6f9ab64c26674cfc9e986b2a898d0f721c53 (patch)
tree52c6a659e0453d8ca43b48eb2d70cb3cd75afc9a
parentb95b7642c9b910e143c0102408001d8ce06ae0cf (diff)
parent8d68ac5bade1aac8836566521c0f625d9f08897a (diff)
Merge pull request #14889 from peak3d/codec
[AddonVideoCodec] retrieve codec name after Open()
-rw-r--r--xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp
index b86f820ef5..06fe701c66 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp
@@ -32,7 +32,6 @@ CAddonVideoCodec::CAddonVideoCodec(CProcessInfo &processInfo, ADDON::BinaryAddon
CLog::Log(LOGERROR, "CInputStreamAddon: Failed to create add-on instance for '%s'", addonInfo->ID().c_str());
return;
}
- m_processInfo.SetVideoDecoderName(GetName(), false);
}
CAddonVideoCodec::~CAddonVideoCodec()
@@ -142,7 +141,10 @@ bool CAddonVideoCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options)
if (!CopyToInitData(initData, hints))
return false;
- return m_struct.toAddon.open(&m_struct, &initData);
+ bool ret = m_struct.toAddon.open(&m_struct, &initData);
+ m_processInfo.SetVideoDecoderName(GetName(), false);
+
+ return ret;
}
bool CAddonVideoCodec::Reconfigure(CDVDStreamInfo &hints)