Back out c4a4b0171b99 (bug 736400) for Android build bustage

This commit is contained in:
Phil Ringnalda 2012-03-25 15:35:37 -07:00
parent b79453b4bf
commit c7ab04c773
4 changed files with 5 additions and 25 deletions

View File

@ -44,12 +44,7 @@
class nsOggDecoder : public nsBuiltinDecoder
{
public:
virtual nsMediaDecoder* Clone() {
if (!nsHTMLMediaElement::IsOggEnabled()) {
return nsnull;
}
return new nsOggDecoder();
}
virtual nsMediaDecoder* Clone() { return new nsOggDecoder(); }
virtual nsDecoderStateMachine* CreateStateMachine();
};

View File

@ -42,12 +42,7 @@
class nsRawDecoder : public nsBuiltinDecoder
{
public:
virtual nsMediaDecoder* Clone() {
if (!nsHTMLMediaElement::IsRawEnabled()) {
return nsnull;
}
return new nsRawDecoder();
}
virtual nsMediaDecoder* Clone() { return new nsRawDecoder(); }
virtual nsDecoderStateMachine* CreateStateMachine();
};

View File

@ -55,13 +55,8 @@
class nsWaveDecoder : public nsBuiltinDecoder
{
public:
virtual nsMediaDecoder* Clone() {
if (!nsHTMLMediaElement::IsWaveEnabled()) {
return nsnull;
}
return new nsWaveDecoder();
}
virtual nsDecoderStateMachine* CreateStateMachine();
virtual nsMediaDecoder* Clone() { return new nsWaveDecoder(); }
virtual nsDecoderStateMachine* CreateStateMachine();
};
#endif

View File

@ -44,12 +44,7 @@
class nsWebMDecoder : public nsBuiltinDecoder
{
public:
virtual nsMediaDecoder* Clone() {
if (!nsHTMLMediaElement::IsWebMEnabled()) {
return nsnull;
}
return new nsWebMDecoder();
}
virtual nsMediaDecoder* Clone() { return new nsWebMDecoder(); }
virtual nsDecoderStateMachine* CreateStateMachine();
};