Merge commit '8ae4d4e117626313e0b7df746e82de84d00d160a' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:40:33 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:40:45 +0000 (20:40 +0200)
* commit '8ae4d4e117626313e0b7df746e82de84d00d160a':
  mov: Fix little endian audio detection

Conflicts:
libavformat/mov.c

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

Trivial merge