diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 05:07:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 05:07:55 +0200 |
| commit | 9253cc496a50e82e56dff5c7d0e15c95f7d50ce2 (patch) | |
| tree | ee275404d26692f3136035897d36dca84c2b2af5 /libavcodec/diracdec.c | |
| parent | 21b30947f2caef424ffe7191433b43b5aac70001 (diff) | |
avcodec/diracdec: Replace default_bsep[] by multiplication
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/diracdec.c')
| -rw-r--r-- | libavcodec/diracdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index dbf2fd1b84..b64ab95f02 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -872,7 +872,6 @@ static void init_planes(DiracContext *s) static int dirac_unpack_prediction_parameters(DiracContext *s) { static const uint8_t default_blen[] = { 4, 12, 16, 24 }; - static const uint8_t default_bsep[] = { 4, 8, 12, 16 }; GetBitContext *gb = &s->gb; unsigned idx, ref; @@ -896,8 +895,8 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) /*[DIRAC_STD] preset_block_params(index). Table 11.1 */ s->plane[0].xblen = default_blen[idx-1]; s->plane[0].yblen = default_blen[idx-1]; - s->plane[0].xbsep = default_bsep[idx-1]; - s->plane[0].ybsep = default_bsep[idx-1]; + s->plane[0].xbsep = 4 * idx; + s->plane[0].ybsep = 4 * idx; } /*[DIRAC_STD] 11.2.4 motion_data_dimensions() Calculated in function dirac_unpack_block_motion_data */ |