[vlc-commits] demux: adaptive: do not recycle mp4a if extradata differs

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Oct 22 19:59:40 2020 +0200| [e7588a9ecc02cf5f0789743a56757bbbfe2da1b9] | committer: Francois Cartegnie

demux: adaptive: do not recycle mp4a if extradata differs

(cherry picked from commit c7019f76cd1448127395bf98cf928f30443ea08c)

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

 modules/demux/adaptive/plumbing/FakeESOutID.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/demux/adaptive/plumbing/FakeESOutID.cpp b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
index 8720e97c90..c2fb35aeda 100644
--- a/modules/demux/adaptive/plumbing/FakeESOutID.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
@@ -102,6 +102,10 @@ bool FakeESOutID::isCompatible( const FakeESOutID *p_other ) const
                 /* Reject audio streams with different or unknown rates */
                 if(fmt.audio.i_rate != p_other->fmt.audio.i_rate || !fmt.audio.i_rate)
                     return false;
+                if(fmt.i_extra &&
+                   (fmt.i_extra != p_other->fmt.i_extra ||
+                    memcmp(fmt.p_extra, p_other->fmt.p_extra, fmt.i_extra)))
+                    return false;
             }
 
             return es_format_IsSimilar( &p_other->fmt, &fmt );