Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:22:12 +0000 (17:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:22:15 +0000 (17:22 +0100)
commit06e5b331f5bc32c7a09db4de90841225dfcd8930
treea3b668ce0f84efb0a01b2404dc00d973551e2f68
parentbc5383e6c4bbb4fd3e703aba54a7653944d46d9b
parent51822879e7732ee8175dad98dde1a135f6e5c1a4
Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4'

* commit '51822879e7732ee8175dad98dde1a135f6e5c1a4':
  h264_mb: constify block_offset

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