Merge "Retry codec matching without profile check if no matching codec was found."