Merge pull request #5042 from koying/fixbitstream

FIX: Upstream Annex-B bitstream conversion fix for some BD mkv iso rips