It is likely that both were the case - disease does, after all, spread more easily through a malnourished population. This sort of thing is never cut-and-dried. A similar effect was brought about in the 17th century by the Thirty Years' War, which had a similar mortality among the farming population. Suddenly food cost a lot of money. When that happens, things change.
The Little Ice Age harmed the ability to grow enough food, putting downward pressure on family size and undermined the feudal order; the Black Death comprehensively shattered the feudal order.
I have read one analysis that suggests that due to the surplus of textiles caused by so many deaths, one consequence was that people began replacing their flax clothing before it was completely useless. This allowed for the recycling of discarded clothing into less expensive and larger scale paper manufacturing that pressured the printing industry to greater efficiency, spurring the development of moveable type printing. That allowed for the inexpensive manufacturing of books that resulted in a literacy boom, and its liberating and democratizing influence.
There was a similar widespread war, the Hundred Years War, going on in Europe at the time of the Black Death.