* commit 'f875a732':
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

Conflicts:
	libavcodec/mpeg4videodec.c

See: fc5c49abMerged-by: Michael Niedermayer <michaelni@gmx.at>