Merge "Determine frame rate from trex box if stsz box is empty" into nyc-dev