Merge commit '56febc993b928ccc039a32158ca60b234c311875'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:30:19 +0000 (14:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:30:19 +0000 (14:30 +0100)
commit97c8ecaadab4e246d969fadd44072025b64747e4
tree0261278a3cfd7a66ff9875eb6d5722d68d375477
parent2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c
parent56febc993b928ccc039a32158ca60b234c311875
Merge commit '56febc993b928ccc039a32158ca60b234c311875'

* commit '56febc993b928ccc039a32158ca60b234c311875':
  h264: move the slice type variables into the per-slice context

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_mvpred.h
libavcodec/h264_parser.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/svq3.c
libavcodec/vaapi_h264.c
libavcodec/vdpau.c