* commit '9d599e3f':
  avi: Improve non-interleaved detection

Conflicts:
	libavformat/avidec.c

See: 8df774be and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>