[FFmpeg-cvslog] Merge commit '7813e6752bdab38a5686c301e869ee71d97bce69'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 18 20:33:37 2014 +0100| [30d3f9769ff3abfa5fe4e09d280bd9664bcf3520] | committer: Michael Niedermayer

Merge commit '7813e6752bdab38a5686c301e869ee71d97bce69'

* commit '7813e6752bdab38a5686c301e869ee71d97bce69':
  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=30d3f9769ff3abfa5fe4e09d280bd9664bcf3520
---