Bug 1401922 - P2. Only set error when non handled. r?alwu
MozReview-Commit-ID: CF2Iw0i0nD8
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -292,18 +292,17 @@ PDMFactory::CreateDecoderWithPDM(Platfor
if (MP4Decoder::IsH264(config.mMimeType) && !aParams.mUseNullDecoder.mUse) {
RefPtr<H264Converter> h = new H264Converter(aPDM, aParams);
const MediaResult result = h->GetLastError();
if (NS_SUCCEEDED(result) || result == NS_ERROR_NOT_INITIALIZED) {
// The H264Converter either successfully created the wrapped decoder,
// or there wasn't enough AVCC data to do so. Otherwise, there was some
// problem, for example WMF DLLs were missing.
m = h.forget();
- }
- if (NS_FAILED(result) && aParams.mError) {
+ } else if (aParams.mError) {
*aParams.mError = result;
}
} else {
m = aPDM->CreateVideoDecoder(aParams);
}
return m.forget();
}