Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:34:30 +0000 (13:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:34:33 +0000 (13:34 +0100)
commitacd6b407c3cebc6dda899820d65e75ad1d75eb63
tree586479a5212830e176b2146234adc4f195545e4b
parentc27f53b9fbcd8f638afecc637ef844b612cc39be
parent06789ad3b71296a9e2fbd0278632d97a5d9af8d7
Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'

* commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7':
  h264: move qp_thresh into the per-slice context

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