[media] partially reverts changeset fa5527cd

This patch is applying some hunks that are already at changeset
c247d7b1, causing a compilation breakage.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>