Merge "aacenc: fix timestamp calculation"