← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic

« back to all changes in this revision

Viewing changes to libavcodec/vc1dec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-09-13 15:36:38 UTC
  • mfrom: (1.3.49 sid)
  • Revision ID: package-import@ubuntu.com-20140913153638-6rfush77baz008o9
Tags: 6:11-1
http://bugs.debian.org/757185
* Upload final 11 release
  - matroskadec: parse stereo mode on decoding (Closes: #757185)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vc1dec.c
4570
4570
            if (mb_has_coeffs)
4571
4571
                cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
4572
4572
            if (!direct) {
4573
 
                if (bmvtype == BMV_TYPE_INTERPOLATED & twomv) {
 
4573
                if (bmvtype == (BMV_TYPE_INTERPOLATED & twomv)) {
4574
4574
                    v->fourmvbp = get_vlc2(gb, v->fourmvbp_vlc->table, VC1_4MV_BLOCK_PATTERN_VLC_BITS, 1);
4575
 
                } else if (bmvtype == BMV_TYPE_INTERPOLATED | twomv) {
 
4575
                } else if (bmvtype == (BMV_TYPE_INTERPOLATED | twomv)) {
4576
4576
                    v->twomvbp = get_vlc2(gb, v->twomvbp_vlc->table, VC1_2MV_BLOCK_PATTERN_VLC_BITS, 1);
4577
4577
                }
4578
4578
            }