[FFmpeg-cvslog] Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  7 19:40:54 2015 +0100| [a75353e73b8b4905283f31e0dd5cbcb9a9db2572] | committer: Michael Niedermayer

Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233'

* commit 'b77e335e441040a40fc6156b8e4a134745d10233':
  configure: Move the .object_arch check to the right place

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

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