In the vid, he's playing the C shape with a capo on fret two, which would make it D, so I guess you're both right.
There's a fab version - solo acoustic fingerstyle - by John Hiatt, on "Avalon Blues", the MJH tribute album Peter Case put together a few years back.