From f1c5301413f6125b590f17ec62915215e3817bdd Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Wed, 3 Nov 2010 16:57:05 +0000 Subject: 100l, calculate mb_change_bits_row_size from the update width. Originally committed as revision 25661 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/truemotion1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/truemotion1.c') diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 94a54f4439..b6b81f7ea1 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -312,11 +312,6 @@ static int truemotion1_decode_header(TrueMotion1Context *s) uint8_t header_buffer[128]; /* logical maximum size of the header */ const uint8_t *sel_vector_table; - /* There is 1 change bit per 4 pixels, so each change byte represents - * 32 pixels; divide width by 4 to obtain the number of change bits and - * then round up to the nearest byte. */ - s->mb_change_bits_row_size = ((s->avctx->width >> 2) + 7) >> 3; - header.header_size = ((s->buf[0] >> 5) | (s->buf[0] << 3)) & 0x7f; if (s->buf[0] < 0x10) { @@ -415,6 +410,11 @@ static int truemotion1_decode_header(TrueMotion1Context *s) av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); } + /* There is 1 change bit per 4 pixels, so each change byte represents + * 32 pixels; divide width by 4 to obtain the number of change bits and + * then round up to the nearest byte. */ + s->mb_change_bits_row_size = ((s->avctx->width >> 2) + 7) >> 3; + if ((header.deltaset != s->last_deltaset) || (header.vectable != s->last_vectable)) { if (compression_types[header.compression].algorithm == ALGO_RGB24H) -- cgit v1.2.3