Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:24:23 +0000 (13:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:24:23 +0000 (13:24 +0100)
commitc27f53b9fbcd8f638afecc637ef844b612cc39be
tree7c6588de62ee97cddb5ddd1f6c77fd4fb7a0c9d3
parentcc31d9ce80abd8b2a1a446f73a8651e2f1d76853
parentd231e84b06a9964c840cff4e228509f706165fb6
Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'

* commit 'd231e84b06a9964c840cff4e228509f706165fb6':
  h264: move the quantizers into the per-slice context

Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2_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
libavcodec/vaapi_h264.c