~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/cscd.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler, Jonathan Nieder, Reinhard Tartler
  • Date: 2011-05-13 12:31:33 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (1.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20110513123133-zqcsj91sf5489y4s
Tags: 4:0.7~beta2-1
[ Jonathan Nieder ]
* only install doc/APIChanges in *-dev and libav-doc packages
* move note on source package lineage to README.Debian
* install NEWS.Debian in libavcodec-dev
* use dpkg source format 3.0 (quilt)
* allow "debian/rules clean" as unprivileged user

[ Reinhard Tartler ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
183
183
 
184
184
    // flip upside down, add difference frame
185
185
    if (buf[0] & 1) { // keyframe
186
 
        c->pic.pict_type = FF_I_TYPE;
 
186
        c->pic.pict_type = AV_PICTURE_TYPE_I;
187
187
        c->pic.key_frame = 1;
188
188
        switch (c->bpp) {
189
189
          case 16:
197
197
                                 c->linelen, c->height);
198
198
        }
199
199
    } else {
200
 
        c->pic.pict_type = FF_P_TYPE;
 
200
        c->pic.pict_type = AV_PICTURE_TYPE_P;
201
201
        c->pic.key_frame = 0;
202
202
        switch (c->bpp) {
203
203
          case 16: