Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:23:10 +0000 (17:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:23:10 +0000 (17:23 +0100)
commita0b39747b7213b5b76c0ce5984c1dac63933737f
treea7e0c573b4882bb07baa8c4160022f9e35e1f52b
parent06e5b331f5bc32c7a09db4de90841225dfcd8930
parent6490a0c0fbe0e55f765ea2aa2e8495181ea1f719
Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'

* commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719':
  h264_mb: constify all uses of H264Context

Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c

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