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)
* commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7':
  h264: move qp_thresh into the per-slice context

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

Simple merge
Simple merge