Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."