Bug 1134487 - Remove delegated constructors in GMP{Audio,Video}Decoder since they're not supported by GCC 4.6. r=cpearce

This commit is contained in:
Brian Birtles 2015-02-19 10:37:29 +09:00
parent bb3d8e3081
commit 78cbd39cef
2 changed files with 12 additions and 6 deletions

View File

@ -62,7 +62,10 @@ public:
GMPAudioDecoder(const mp4_demuxer::AudioDecoderConfig& aConfig,
MediaTaskQueue* aTaskQueue,
MediaDataDecoderCallbackProxy* aCallback)
: GMPAudioDecoder(aConfig, aTaskQueue, aCallback, new AudioCallbackAdapter(aCallback))
: mConfig(aConfig)
, mCallback(aCallback)
, mGMP(nullptr)
, mAdapter(new AudioCallbackAdapter(aCallback))
{
}

View File

@ -71,11 +71,14 @@ public:
layers::ImageContainer* aImageContainer,
MediaTaskQueue* aTaskQueue,
MediaDataDecoderCallbackProxy* aCallback)
: GMPVideoDecoder(aConfig, aLayersBackend, aImageContainer, aTaskQueue, aCallback,
new VideoCallbackAdapter(aCallback,
VideoInfo(aConfig.display_width,
aConfig.display_height),
aImageContainer))
: mConfig(aConfig)
, mCallback(aCallback)
, mGMP(nullptr)
, mHost(nullptr)
, mAdapter(new VideoCallbackAdapter(aCallback,
VideoInfo(aConfig.display_width,
aConfig.display_height),
aImageContainer))
{
}