Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 22:16:36 +0000 (23:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 22:16:36 +0000 (23:16 +0100)
commitfa7c08d5e192aea77fdfb7f52c44c196a3ba4452
tree7089b439143302515c4f0339b617b0e88004a6cd
parenta6cb0534e2b5e91c119c77165bc65a6ff14e649b
parentc28ed1d743443e783537d279ae721be3bbdf7646
Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'

* commit 'c28ed1d743443e783537d279ae721be3bbdf7646':
  h264: move [uv]linesize to the per-slice context

Conflicts:
libavcodec/h264_mb.c
libavcodec/h264_slice.c

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