* commit 'e70c5b03':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
	libavformat/swfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>