← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libav/quantal-updates

« back to all changes in this revision

Viewing changes to libavcodec/vp56.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-12-26 11:58:50 UTC
  • mfrom: (1.3.9 sid)
  • Revision ID: package-import@ubuntu.com-20111226115850-0v2ivu79li21q1cc
Tags: 4:0.7.3-2ubuntu1
* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, 
    x264, and xvid  (all in universe)
* Install libraries in multi-arch directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vp56.c
537
537
            s->mb_type = VP56_MB_INTER_NOVEC_PF;
538
538
        }
539
539
 
540
 
        s->parse_coeff_models(s);
 
540
        if (s->parse_coeff_models(s))
 
541
            goto next;
541
542
 
542
543
        memset(s->prev_dc, 0, sizeof(s->prev_dc));
543
544
        s->prev_dc[1][VP56_FRAME_CURRENT] = 128;
601
602
            }
602
603
        }
603
604
 
 
605
    next:
604
606
        if (p->key_frame || golden_frame) {
605
607
            if (s->framep[VP56_FRAME_GOLDEN]->data[0] &&
606
608
                s->framep[VP56_FRAME_GOLDEN] != s->framep[VP56_FRAME_GOLDEN2])