Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:20:49 +0000 (13:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:20:54 +0000 (13:20 +0100)
* commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6':
  h264: do not copy qscale when updating per-thread contexts

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

Simple merge