[FFmpeg-cvslog] Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4

Michael Niedermayer git at videolan.org
Sun Jan 18 02:33:04 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:27:17 2015 +0100| [9b669f9b14134c5d3e9f03ae987ade15689bd14c] | committer: Michael Niedermayer

Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4

* commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262':
  configure: Fix enabling memalign_hack automatically

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list