[FFmpeg-cvslog] Merge commit '8ae4d4e117626313e0b7df746e82de84d00d160a' into release/2.4

Michael Niedermayer git at videolan.org
Tue May 19 20:47:47 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 20:40:33 2015 +0200| [60d0d68a8d6ac857e534df375c184a0ad232887a] | committer: Michael Niedermayer

Merge commit '8ae4d4e117626313e0b7df746e82de84d00d160a' into release/2.4

* commit '8ae4d4e117626313e0b7df746e82de84d00d160a':
  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=60d0d68a8d6ac857e534df375c184a0ad232887a
---





More information about the ffmpeg-cvslog mailing list