[FFmpeg-cvslog] Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:34:30 2015 +0100| [acd6b407c3cebc6dda899820d65e75ad1d75eb63] | committer: Michael Niedermayer

Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acd6b407c3cebc6dda899820d65e75ad1d75eb63
---