No, it wasn’t the same woman. There are multiple witnesses who have said that he was in fact waving it around and walking through the store with it on his shoulder.
http://www.daytondailynews.com/news/news/new-details-in-deaths-of-2-at-walmart/nhWF3/
FTR: I know nothing about those two sources. So, maybe you can find a source that says the woman in the video isn't the victim.