[FFmpeg-cvslog] Merge commit '634d9d8b398982647b3d7160641198744901d8d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 13:37:14 2014 +0100| [fa4f57399774b7c09c5978652b2eaea77f8851e1] | committer: Michael Niedermayer

Merge commit '634d9d8b398982647b3d7160641198744901d8d8'

* commit '634d9d8b398982647b3d7160641198744901d8d8':
  arm: get_cabac inline asm

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

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