vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Jul 4 09:28:08 2016 +0200| [43c910762be645f98dfce51ec3d314704ba80a87] | committer: Francois Cartegnie
demux: adaptive: fix null deref on unexec'ed es creation will happen with larger buffering > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43c910762be645f98dfce51ec3d314704ba80a87 --- modules/demux/adaptive/plumbing/FakeESOut.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/adaptive/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp index 62fa66f..bb53dbc 100644 --- a/modules/demux/adaptive/plumbing/FakeESOut.cpp +++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp @@ -120,7 +120,7 @@ void FakeESOut::createOrRecycleRealEsID( FakeESOutID *es_id ) recycle_candidates.erase( it ); break; } - else if( cand->getFmt()->i_cat == es_id->getFmt()->i_cat ) + else if( cand->getFmt()->i_cat == es_id->getFmt()->i_cat && cand->realESID() ) { /* We need to enforce same selection when not reused Otherwise the es will select any other compatible track _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
