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)
* commit '5c8280c3075dd54f26752c3a1185647578421703':
  h264: move last_qscale_diff into the per-slice context

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

Simple merge
Simple merge
Simple merge