Hi, I'm having a hard time making a proper fix for ticket #1617, and so trying to get a clue for once about what's going on in this demuxer. Attached a small cleanup about the code I crawled. Patch 4 is already reviewed, and most of the patches here should be relatively trivial. Maybe the patch 8 needs some little attention. Regards,