diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:48:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:48:53 +0100 |
| commit | a4952e7343f9a77d2995d699ac045b095ab11052 (patch) | |
| tree | 31482d42b86320b51c83097506bb513c9e17bc69 /libavcodec/h264.h | |
| parent | 4c5c913dd8d946022ba160ec480694222aab061d (diff) | |
| parent | 5c8280c3075dd54f26752c3a1185647578421703 (diff) | |
| download | ffmpeg-a4952e7343f9a77d2995d699ac045b095ab11052.tar.gz | |
Merge commit '5c8280c3075dd54f26752c3a1185647578421703'
* commit '5c8280c3075dd54f26752c3a1185647578421703':
h264: move last_qscale_diff into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index d43713de6e..a342cfc16c 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -344,6 +344,7 @@ typedef struct H264SliceContext { int qscale; int chroma_qp[2]; // QPc int qp_thresh; ///< QP threshold to skip loopfilter + int last_qscale_diff; // Weighted pred stuff int use_weight; @@ -534,7 +535,6 @@ typedef struct H264Context { /* chroma_pred_mode for i4x4 or i16x16, else 0 */ uint8_t *chroma_pred_mode_table; - int last_qscale_diff; uint8_t (*mvd_table[2])[2]; DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5 * 8][2]; uint8_t *direct_table; |