This change is in preparation for implementing audio codecs into the library and using audio as timing for video playback. (cherry picked from commit 7c10e1a08d7a109b63c9258578eb98aa9dcc1425)