generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

100l, calculate mb_change_bits_row_size from the update width.

Browse Source 
Originally committed as revision 25661 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-11-03 16:57:05 +00:00
parent 97113c2178
commit f1c5301413
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/truemotion1.c
View File

@ -312,11 +312,6 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
uint8_t header_buffer[128]; /* logical maximum size of the header */ uint8_t header_buffer[128]; /* logical maximum size of the header */
const uint8_t *sel_vector_table; 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; header.header_size = ((s->buf[0] >> 5) | (s->buf[0] << 3)) & 0x7f;
if (s->buf[0] < 0x10) 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)); 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 ((header.deltaset != s->last_deltaset) || (header.vectable != s->last_vectable))
{ {
if (compression_types[header.compression].algorithm == ALGO_RGB24H) if (compression_types[header.compression].algorithm == ALGO_RGB24H)