summaryrefslogtreecommitdiff
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 3d8f624713..71f531ec84 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -359,6 +359,9 @@ typedef struct H264SliceContext {
int col_parity;
int col_fieldoff;
+ int dist_scale_factor[32];
+ int dist_scale_factor_field[2][32];
+
/**
* non zero coeff count cache.
* is 64 if not available.
@@ -444,8 +447,6 @@ typedef struct H264Context {
int picture_structure;
int first_field;
- int dist_scale_factor[32];
- int dist_scale_factor_field[2][32];
int map_col_to_list0[2][16 + 32];
int map_col_to_list0_field[2][2][16 + 32];
@@ -821,7 +822,7 @@ void ff_h264_init_cabac_states(H264Context *h, H264SliceContext *sl);
void h264_init_dequant_tables(H264Context *h);
-void ff_h264_direct_dist_scale_factor(H264Context *const h);
+void ff_h264_direct_dist_scale_factor(H264Context *const h, H264SliceContext *sl);
void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl);
void ff_h264_pred_direct_motion(H264Context *const h, H264SliceContext *sl,
int *mb_type);