Merge commit '39ab2ea53121b9976a619cd545fbd3464b908696'
authorClément Bœsch <u@pkh.me>
Wed, 29 Jun 2016 18:07:52 +0000 (20:07 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 29 Jun 2016 18:07:52 +0000 (20:07 +0200)
commit57d30fde9ea847cf4bff70a1419facad905e72a4
tree301746a8c61f6e8aa4c3b70eb1391b0ca180d48e
parentc28aecc56ace7a6f5f21c1484d00932d4777f4e8
parent39ab2ea53121b9976a619cd545fbd3464b908696
Merge commit '39ab2ea53121b9976a619cd545fbd3464b908696'

* commit '39ab2ea53121b9976a619cd545fbd3464b908696':
  h264: rename mmco_index to nb_mmco

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c