[vlc-commits] codec: faad: reject ELD profile

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Feb 21 20:25:20 2019 +0100| [eaedf156a46ad8ac27bc64942892b358f91e4a61] | committer: Francois Cartegnie

codec: faad: reject ELD profile

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eaedf156a46ad8ac27bc64942892b358f91e4a61
---

 modules/codec/faad.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 017a6f9598..ff93e84913 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -109,7 +109,10 @@ static int Open( vlc_object_t *p_this )
     decoder_sys_t *p_sys;
     NeAACDecConfiguration *cfg;
 
-    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
+    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A ||
+        p_dec->fmt_in.i_profile == AAC_PROFILE_ELD ||
+        (p_dec->fmt_in.i_extra > 1 &&
+         (GetWBE(p_dec->fmt_in.p_extra) & 0xffe0) == 0xf8e0)) /* ELD AOT */
     {
         return VLC_EGENERIC;
     }