Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev