cmus: ffmpeg2 patch merged upstream

Change-Id: I6a3dcaad7b612a65a090e0436c7594e42dda7f2c