Added code to accommodate the absence of swresample
Merge branch 'master' of github.com:chung-leong/av

Conflicts:
	av.c