* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2