diff options
| author | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2016-09-27 09:08:51 +0100 |
|---|---|---|
| committer | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2016-09-27 17:20:18 +0100 |
| commit | a828b12ca8c0b253ada58cc5ebc96c24dcd1212d (patch) | |
| tree | c3ec7883aa1ccea8d43b6c8911faac0a3cbbaed0 | |
| parent | 80f3bf7ac2dc48d0cd7f5664647680b15e3bc870 (diff) | |
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
| -rw-r--r-- | ext/fdkaac/gstfdkaacenc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c index 3405ec185..01a335ccc 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); |