[FFmpeg-cvslog] Merge commit '423f5d50e499ab972f507115700c8f31ed8993e4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 21:43:39 2015 +0100| [c7e1e4c48aee1c873759c693bf4d093d362f4821] | committer: Michael Niedermayer

Merge commit '423f5d50e499ab972f507115700c8f31ed8993e4'

* commit '423f5d50e499ab972f507115700c8f31ed8993e4':
  mov: Fix little endian audio detection

Conflicts:
	libavformat/mov.c

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

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