Abuse esBuffer to track the vid/aud stream id.
Merge pull request #6384 from unknownbrackets/mpeg-streams

Abuse esBuffer to track the vid/aud stream id