From a828b12ca8c0b253ada58cc5ebc96c24dcd1212d Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Tue, 27 Sep 2016 09:08:51 +0100 Subject: [PATCH] fdkaac: fix error with AOT_MP2_AAC_LC removed from libfdkaac API AOT_MP2_AAC_LC is a "pseudo AOT" which got removed after 0.1.4, and maps to AOT_AAC_LC. Remove mpegversion 2 from th caps to match. https://bugzilla.gnome.org/show_bug.cgi?id=772067 --- ext/fdkaac/gstfdkaacenc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c index 3405ec185e..01a335cccc 100644 --- a/ext/fdkaac/gstfdkaacenc.c +++ b/ext/fdkaac/gstfdkaacenc.c @@ -127,7 +127,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/mpeg, " - "mpegversion = (int) {2, 4}, " + "mpegversion = (int) 4, " "rate = (int) { " SAMPLE_RATES " }, " "channels = (int) {1, 2, 3, 4, 5, 6, 8}, " "stream-format = (string) { adts, adif, raw }, " @@ -296,11 +296,7 @@ gst_fdkaacenc_set_format (GstAudioEncoder * enc, GstAudioInfo * info) return FALSE; } - if (mpegversion == 4) { - aot = AOT_AAC_LC; - } else { - aot = AOT_MP2_AAC_LC; - } + aot = AOT_AAC_LC; if ((err = aacEncoder_SetParam (self->enc, AACENC_AOT, aot)) != AACENC_OK) { GST_ERROR_OBJECT (self, "Unable to set AOT %d: %d\n", aot, err);