Merge commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:10:31 +0000 (16:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:10:31 +0000 (16:10 +0100)
commitdb4234c5002fc0ac7ecae323874b97a4547ae0c3
treee1953f9959ad4bde6e5a2240a81d42673ac6b83b
parent70eec8f432dcee5b9867ba01a26436a04a9a0423
parent07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa
Merge commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa'

* commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa':
  h264: move is_complex into the per-slice context

Conflicts:
libavcodec/h264_slice.c
libavcodec/svq3.c

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