summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-05-26 07:43:00 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-05-26 07:43:00 +0000
commit0378202dc85bb7a97ce03aa1f7ccaee86dd159d0 (patch)
treed176c4f98fddcf1716ea1ab4829affb75570805e
parent2b248e29ffeae551331b0f72835f3e70506e7a57 (diff)
ext/ffmpeg/gstffmpegdec.c: Explicitely disable the AAC decoders as they don't work very well and we have better alter...
Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): Explicitely disable the AAC decoders as they don't work very well and we have better alternatives. Fixes bug #534392.
-rw-r--r--ChangeLog6
-rw-r--r--ext/ffmpeg/gstffmpegdec.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fd2309..0cadae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-05-26 Sebastian Dröge <slomo@circular-chaos.org>
+ * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
+ Explicitely disable the AAC decoders as they don't work very well
+ and we have better alternatives. Fixes bug #534392.
+
+2008-05-26 Sebastian Dröge <slomo@circular-chaos.org>
+
Patch by:
Hans de Goede <j dot w dot r degoede at hhs dot nl>
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 744f434..db3fcbb 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -2452,7 +2452,9 @@ gst_ffmpegdec_register (GstPlugin * plugin)
!strcmp (in_plugin->name, "vorbis") ||
!strcmp (in_plugin->name, "mpeg1video") ||
!strcmp (in_plugin->name, "wavpack") ||
- !strcmp (in_plugin->name, "mp2")) {
+ !strcmp (in_plugin->name, "mp2") ||
+ !strcmp (in_plugin->name, "libfaad") ||
+ !strcmp (in_plugin->name, "mpeg4aac")) {
GST_LOG ("Ignoring decoder %s", in_plugin->name);
goto next;
}