Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:18:29 +0000 (16:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:18:29 +0000 (16:18 +0100)
commit668c65e7e73a21c86f43ffa1f79bf023fa44cbcd
tree0cb290199a3e87504efbce8519dc80143e902281
parentdb4234c5002fc0ac7ecae323874b97a4547ae0c3
parent0edbe6faa7ef80daf0e84353cbe733389bf1a522
Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'

* commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522':
  h264: move mb_xy into the per-slice context

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.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