Skip to content

Commit

Permalink
Revert "Add the AMR audio codec to the list of supported types."
Browse files Browse the repository at this point in the history
Doesn't seem like AMR has ever worked and I can't see many people
missing the ability to play 12bps audio.

This reverts commit b6e30f3.
  • Loading branch information
stuartm committed Jan 4, 2011
1 parent b6e30f3 commit 4d1bc4a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions mythplugins/mythmusic/mythmusic/avfdecoder.cpp
Expand Up @@ -15,7 +15,7 @@
- Initial release
- 1/9/2004 - Improved seek support
- ?/?/2009 - Extended to support many more filetypes and bug fixes
- ?/7/2010 - Add streaming support
- ?/7/2010 - Add streaming support
*/

// QT headers
Expand Down Expand Up @@ -131,7 +131,7 @@ bool avfDecoder::initialize()
// give up if we dont have an audiooutput set
if (!output())
{
error("avfDecoder: initialise called with a NULL audiooutput");
error("avfDecoder: initialise called with a NULL audiooutput");
return false;
}

Expand Down Expand Up @@ -168,7 +168,7 @@ bool avfDecoder::initialize()
if (!m_inputFormat)
{
error("Could not identify the stream type in "
"avfDecoder::initialize");
"avfDecoder::initialize");
deinit();
return false;
}
Expand Down Expand Up @@ -525,8 +525,7 @@ bool avfDecoderFactory::supports(const QString &source) const
const QString &avfDecoderFactory::extension() const
{
static QString ext(".mp3|.mp2|.ogg|.oga|.flac|.wma|.wav|.ac3|.oma|.omg|"
".atp|.ra|.dts|.aac|.m4a|.aa3|.tta|.mka|.aiff|.swa|.wv|"
".amr");
".atp|.ra|.dts|.aac|.m4a|.aa3|.tta|.mka|.aiff|.swa|.wv");
return ext;
}

Expand Down
2 changes: 1 addition & 1 deletion mythplugins/mythmusic/mythmusic/main.cpp
Expand Up @@ -554,7 +554,7 @@ static void setupKeys(void)
"MythMusic Media Handler 2/2"), "", "", handleMedia,
MEDIATYPE_MMUSIC, "mp3,mp2,ogg,oga,flac,wma,wav,ac3,"
"oma,omg,atp,ra,dts,aac,m4a,aa3,tta,"
"mka,aiff,swa,wv,amr");
"mka,aiff,swa,wv");
}

int mythplugin_init(const char *libversion)
Expand Down

0 comments on commit 4d1bc4a

Please sign in to comment.