Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:37:55 +0000 (14:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:37:55 +0000 (14:37 +0100)
commit4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55
tree86c21a7454f7c1ffd7897b78b42280414d9e1ef0
parent97c8ecaadab4e246d969fadd44072025b64747e4
parented451a08a46b2b07fd2dba3e55ffddd18ae6e3d6
Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'

* commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6':
  h264: move sub_mb_type into the per-slice context

Conflicts:
libavcodec/h264_cabac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_mc_template.c