Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:30:10 +0000 (15:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:36:57 +0000 (15:36 +0100)
commit739edc1a7e83cdca27c3defbc3f057e98a3de472
tree6d7c29f22fd58077d5d20682bc73433179c55a0d
parent35a788d953838c1b7f34038ef54fddc3d11994fe
parentbf03a878a76dea29b36f368759e9f66102b39a5f
Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'

* commit 'bf03a878a76dea29b36f368759e9f66102b39a5f':
  h264: move mb[_{padding,luma_dc}] into the per-slice context

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

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