[FFmpeg-cvslog] Merge commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 02:34:10 2014 +0200| [0be41c65862c8ffc9b5b92d4b014f1fc23d8d52e] | committer: Michael Niedermayer

Merge commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc' into release/0.10

* commit '5463a2b0566b34b9e3847db9ceb1ef1d2a6004fc':
  movdec: handle 0x7fff langcode as macintosh per the specs
  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=0be41c65862c8ffc9b5b92d4b014f1fc23d8d52e
---