[FFmpeg-cvslog] Merge commit '8b9d0f5d3aceb67d472d190db53a21177fea9275' into release/2.2

Michael Niedermayer git at videolan.org
Mon Jun 1 12:33:21 CEST 2015


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 12:25:35 2015 +0200| [a1323ec1793b9800c1dce19de66afc28929e6eef] | committer: Michael Niedermayer

Merge commit '8b9d0f5d3aceb67d472d190db53a21177fea9275' into release/2.2

* commit '8b9d0f5d3aceb67d472d190db53a21177fea9275':
  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=a1323ec1793b9800c1dce19de66afc28929e6eef
---





More information about the ffmpeg-cvslog mailing list