diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 17:39:15 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 17:39:30 +0400 |
| commit | e84194f06024892fc33684c5a1726c97a0c0a45c (patch) | |
| tree | f9eeea5ebc69dc025be80845d2b82b206d51b037 /libavcodec/h264.h | |
| parent | af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e (diff) | |
| parent | ed2d7d5868a4a5d914f1e5488d63ea696a3b2937 (diff) | |
Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'
* commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937':
ff_h264_direct_ref_list_init: fix B slice check.
h264: increase dist_scale_factor for up to 32 references
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 af0c1e56b8..24c21de1e8 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -368,7 +368,7 @@ typedef struct H264Context { int direct_spatial_mv_pred; int col_parity; int col_fieldoff; - int dist_scale_factor[16]; + 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]; |