[FFmpeg-cvslog] Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 02:58:31 2014 +0200| [11ba0c82076dd4b22b5d28ff8004308f6ee99b4e] | committer: Michael Niedermayer

Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
  x86: h264dsp: Fix link failure with optimizations disabled

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

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