Merge commit '5c8280c3075dd54f26752c3a1185647578421703'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:48:50 +0000 (15:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:48:53 +0000 (15:48 +0100)
commita4952e7343f9a77d2995d699ac045b095ab11052
tree31482d42b86320b51c83097506bb513c9e17bc69
parent4c5c913dd8d946022ba160ec480694222aab061d
parent5c8280c3075dd54f26752c3a1185647578421703
Merge commit '5c8280c3075dd54f26752c3a1185647578421703'

* commit '5c8280c3075dd54f26752c3a1185647578421703':
  h264: move last_qscale_diff into the per-slice context

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