[vlc-commits] demux: adaptive: fix cross category es recycling

Francois Cartegnie git at videolan.org
Wed Jul 26 16:39:24 CEST 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 26 16:35:39 2017 +0200| [403dfe1a9a48fbc1c946b55cc4ba9269aaf1ba84] | committer: Francois Cartegnie

demux: adaptive: fix cross category es recycling

refs #18565

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

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

diff --git a/modules/demux/adaptive/plumbing/FakeESOutID.cpp b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
index 73076a2773..41b93d9904 100644
--- a/modules/demux/adaptive/plumbing/FakeESOutID.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
@@ -72,12 +72,15 @@ const es_format_t *FakeESOutID::getFmt() const
 
 bool FakeESOutID::isCompatible( const FakeESOutID *p_other ) const
 {
+    if( p_other->fmt.i_cat != fmt.i_cat )
+        return false;
+
     switch(fmt.i_codec)
     {
         case VLC_CODEC_H264:
         case VLC_CODEC_HEVC:
         case VLC_CODEC_VC1:
-            return true;
+                return true;
 
         default:
             if(fmt.i_cat == AUDIO_ES)



More information about the vlc-commits mailing list