Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:02:02 +0000 (14:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:02:02 +0000 (14:02 +0100)
commitb7e0356cc33297d8db12b56051841f914b6f1ba9
treec520d2fee090f90cd02b1565dea019c23dabd6df
parent6ec279b54c09f47208930021a38a742f2cc09324
parentf69574cf7aca4fe4d57a2155e925f37fc863474d
Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'

* commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d':
  h264: move non_zero_count_cache into the per-slice context

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

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