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)
* commit '8281cd5cb80582d668ce0848e0e035b383f161f6':
  h264_cabac: drop an always true condition

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

Simple merge