Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Aug 2013 10:26:08 +0000 (12:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Aug 2013 10:26:14 +0000 (12:26 +0200)
commit21ba80214c0690c8d1fcc359c2645c363470701b
treedc3dce50cfefd488871dcc42ea83bcca6f1bcedc
parent626739ebbb76b14b03c9946c192570938f5e2494
parentff9d57e7dfc8c171bea3fb9129aa87fa28d89f18
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_cabac.c