Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'
authorClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:30:13 +0000 (14:30 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:30:13 +0000 (14:30 +0200)
commit5be1440c74d017b935a447b4dc979b7bb11f6aff
treefde8443c379e7d170bac930150dd09f78d0c0174
parent0768aaec1d683226e613e692080a588359c31334
parent0a35f128f3c6e0ae9a0a2236c557602c108da269
Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'

* commit '0a35f128f3c6e0ae9a0a2236c557602c108da269':
  cabac: x86: Give optimizations header a more meaningful name

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/h264_cabac.c
libavcodec/x86/h264_cabac.c