[FFmpeg-cvslog] Merge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:50:32 2014 +0200| [6a356801952b6c38042ef267808dbacbdb700eef] | committer: Michael Niedermayer

Merge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1

* commit '03562c44c0c1e59d2a598390c5b2181ac406611c':
  avi: Improve non-interleaved detection

Conflicts:
	libavformat/avidec.c

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

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