[FFmpeg-cvslog] Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 17:59:58 2014 +0200| [2aa659233810cb17e4748a52298d018fa9cb8d4a] | committer: Michael Niedermayer

Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2

* commit '7f954ca502a16feeca44d4e9a7d450b404dabc94':
  avi: Improve non-interleaved detection

Conflicts:
	Changelog
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2aa659233810cb17e4748a52298d018fa9cb8d4a
---