[FFmpeg-cvslog] Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:20:49 2015 +0100| [cc31d9ce80abd8b2a1a446f73a8651e2f1d76853] | committer: Michael Niedermayer

Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'

* commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6':
  h264: do not copy qscale when updating per-thread contexts

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

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