Merge commit '634d9d8b398982647b3d7160641198744901d8d8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 12:37:14 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 12:37:29 +0000 (13:37 +0100)
commitfa4f57399774b7c09c5978652b2eaea77f8851e1
tree2b3ed943f0f50750cb99e762ff86f53f9007b3cb
parentcbee7ff0b7dfefab7f9a5d8639e493ab90c0a0cb
parent634d9d8b398982647b3d7160641198744901d8d8
Merge commit '634d9d8b398982647b3d7160641198744901d8d8'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/cabac.h
libavcodec/cabac_functions.h