ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu May 7 05:07:55 2015 +0200| [9253cc496a50e82e56dff5c7d0e15c95f7d50ce2] | committer: Michael Niedermayer
avcodec/diracdec: Replace default_bsep[] by multiplication Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9253cc496a50e82e56dff5c7d0e15c95f7d50ce2 --- libavcodec/diracdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index dbf2fd1..b64ab95 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 */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
