Merge pull request #2870 from popcornmix/pts_dts_adjust