Merge commit '8281cd5cb80582d668ce0848e0e035b383f161f6'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 19:46:57 +0000 (16:46 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 19:46:57 +0000 (16:46 -0300)
commitfd4eb56528e1bf6529397051838a28d2a39d8e01
treed1a8032b5a72c3628c060722f8d0b00acfa6b21c
parentf41048f6ec5671c2e09ae317cecc1e98ecc3c2ce
parent8281cd5cb80582d668ce0848e0e035b383f161f6
Merge commit '8281cd5cb80582d668ce0848e0e035b383f161f6'

* commit '8281cd5cb80582d668ce0848e0e035b383f161f6':
  h264_cabac: drop an always true condition

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/h264_cabac.c