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)
commitcc31d9ce80abd8b2a1a446f73a8651e2f1d76853
tree4fd3a8d617429f87ca9469150eb10e26db130454
parent756dc7bd18b88fdde5c06c701375a6570500e58c
parentd40ae0e595fe90b5583b9269f8bb000402bde5a6
Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'

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

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