~ubuntu-branches/ubuntu/saucy/libav/saucy

« back to all changes in this revision

Viewing changes to libavcodec/proresdec.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2013-07-11 09:21:04 UTC
  • mfrom: (1.3.33 sid)
  • Revision ID: package-import@ubuntu.com-20130711092104-bpwqqjna11vp50vy
Tags: 6:0.8.7-1ubuntu1
* Merge from debian/unstable, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
    vo-aacenc, vo-amrenc, x264, and xvid  (all in universe)
  - do not build libav-extra-dbg, it is build from the libav-extra source
    package in ubuntu.
  - drop libav-regular-dbg, not necessary in ubuntu
  - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
  - several ifdefs in debian/rules that allow the use of the same file
    in libav and libav-extra (most of this can be merged into the debian
    package)

Show diffs side-by-side

added added

removed removed

Lines of Context:
186
186
    if (ctx->frame_type) {      /* if interlaced */
187
187
        ctx->picture.interlaced_frame = 1;
188
188
        ctx->picture.top_field_first  = ctx->frame_type & 1;
 
189
    } else {
 
190
        ctx->picture.interlaced_frame = 0;
189
191
    }
190
192
 
191
193
    ctx->alpha_info = buf[17] & 0xf;