For the narrative simplicity I'd say you may be right, he also may be talking to Rickon if thats the case.
Also looking at the trailer again, looks like when Danny is stripped the look in her eye seems to be determined rather than depression (like she was in season 1). I am very curious on whats going on there. Especially since we see Drogon flying over the khalassar... I hope its a duel to lead the khalassar (like the one that got Khal Drogo wounded) and she chooses fire, not unlike her dear crazy father...
Also this new red woman seems to be challenging Tyrion and Varis.
as for the rest of the trailer, well: