Merge commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:25:04 +0000 (16:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:46:15 +0000 (16:46 +0100)
commitd76559fb5f529db5f14d304936cadebce902b68c
treecc7c6a35be33afc181a7a03749fdab72b693cd0c
parent668c65e7e73a21c86f43ffa1f79bf023fa44cbcd
parentd4d9068cdf8f4b2b87ae87a2ef880d243f77b977
Merge commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977'

* commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977':
  h264: move mb_{x,y} into the per-slice context

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 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_mb_template.c
libavcodec/h264_mc_template.c
libavcodec/h264_mvpred.h
libavcodec/h264_slice.c
libavcodec/svq3.c
libavcodec/vaapi_h264.c