vg methods require the vg be passed as first object; allows this file to compile on Debian Wheezy amd64
libavutil-dev version 1.0.8 support, requires we conditionalize the avutil/channel_layout.h include
Merge branch 'master' of git://github.com/adicarlo/RetroArch

Conflicts:
	record/ffemu.c