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)
* commit '51822879e7732ee8175dad98dde1a135f6e5c1a4':
  h264_mb: constify block_offset

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

Simple merge
Simple merge