Bug 1046282 part 2: Drop unnecessary else-after-return in EMEDecoderModule.cpp. r=rillian

This commit is contained in:
Daniel Holbert 2014-07-30 18:40:18 -07:00
Родитель 4ee09d7e76
Коммит 5f3d16188e
1 изменённых файлов: 26 добавлений и 26 удалений

Просмотреть файл

@ -202,7 +202,8 @@ EMEDecoderModule::CreateH264Decoder(const VideoDecoderConfig& aConfig,
if (mCDMDecodesVideo) { if (mCDMDecodesVideo) {
NS_WARNING("Support for CDM that decodes video not yet supported"); NS_WARNING("Support for CDM that decodes video not yet supported");
return nullptr; return nullptr;
} else { }
nsRefPtr<MediaDataDecoder> decoder(mPDM->CreateH264Decoder(aConfig, nsRefPtr<MediaDataDecoder> decoder(mPDM->CreateH264Decoder(aConfig,
aLayersBackend, aLayersBackend,
aImageContainer, aImageContainer,
@ -217,7 +218,6 @@ EMEDecoderModule::CreateH264Decoder(const VideoDecoderConfig& aConfig,
mTaskQueue, mTaskQueue,
mProxy); mProxy);
} }
}
MediaDataDecoder* MediaDataDecoder*
EMEDecoderModule::CreateAACDecoder(const AudioDecoderConfig& aConfig, EMEDecoderModule::CreateAACDecoder(const AudioDecoderConfig& aConfig,
@ -227,7 +227,8 @@ EMEDecoderModule::CreateAACDecoder(const AudioDecoderConfig& aConfig,
if (mCDMDecodesAudio) { if (mCDMDecodesAudio) {
NS_WARNING("Support for CDM that decodes audio not yet supported"); NS_WARNING("Support for CDM that decodes audio not yet supported");
return nullptr; return nullptr;
} else { }
nsRefPtr<MediaDataDecoder> decoder(mPDM->CreateAACDecoder(aConfig, nsRefPtr<MediaDataDecoder> decoder(mPDM->CreateAACDecoder(aConfig,
aAudioTaskQueue, aAudioTaskQueue,
aCallback)); aCallback));
@ -240,6 +241,5 @@ EMEDecoderModule::CreateAACDecoder(const AudioDecoderConfig& aConfig,
mTaskQueue, mTaskQueue,
mProxy); mProxy);
} }
}
} // namespace mozilla } // namespace mozilla