Merge commit '91ef250713d04d675a16e5b030d7226baafe3f82' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:26:49 +0000 (12:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:27:47 +0000 (12:27 +0100)
commit45eb2a0d49c1086f5f6ed56490821da7fd3dea0b
treeea34e926fc796ce29ac022cf12119c568e01a221
parent019b4b0650958210cc203924c6f0d5871b10d702
parent91ef250713d04d675a16e5b030d7226baafe3f82
Merge commit '91ef250713d04d675a16e5b030d7226baafe3f82' into release/2.2

* commit '91ef250713d04d675a16e5b030d7226baafe3f82':
  h264_cabac: Break infinite loops

Conflicts:
libavcodec/h264_cabac.c

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