aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 22:28:46 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:13 +0100
commitbe69f0a800903b7573b18d9287d18b2f368b8b11 (patch)
tree7d44cd6d7f0a48f733a35d28533e852f20d944b1 /libavcodec/h264.h
parent066aafced4dc6c7c9e7b37082635472249f1e93e (diff)
downloadffmpeg-be69f0a800903b7573b18d9287d18b2f368b8b11.tar.gz
h264: move col_{parity,fieldoff} into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index a259a97ca5..3d8f624713 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -356,6 +356,8 @@ typedef struct H264SliceContext {
int neighbor_transform_size;
int direct_spatial_mv_pred;
+ int col_parity;
+ int col_fieldoff;
/**
* non zero coeff count cache.
@@ -442,8 +444,6 @@ typedef struct H264Context {
int picture_structure;
int first_field;
- int col_parity;
- int col_fieldoff;
int dist_scale_factor[32];
int dist_scale_factor_field[2][32];
int map_col_to_list0[2][16 + 32];