← Back to branch summary

~siretart/xine-lib/ubuntu

« back to all changes in this revision

Viewing changes to src/libffmpeg/libavcodec/smc.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2005-12-15 13:13:45 UTC
  • mto: (40.2.1 squeeze) (0.1.19 upstream)
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20051215131345-x3rwu3clsnn3v4dv
Import upstream version 1.1.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libffmpeg/libavcodec/smc.c
125
125
            chunk_size, s->size);
126
126
 
127
127
    chunk_size = s->size;
128
 
    total_blocks = (s->avctx->width * s->avctx->height) / (4 * 4);
 
128
    total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
129
129
 
130
130
    /* traverse through the blocks */
131
131
    while (total_blocks) {
448
448
{
449
449
    SmcContext *s = (SmcContext *)avctx->priv_data;
450
450
 
451
 
    /* no supplementary picture */
452
 
    if (buf_size == 0)
453
 
        return 0;
454
 
 
455
451
    s->buf = buf;
456
452
    s->size = buf_size;
457
453