← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/dv.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:
libavcodec/dv.c
1095
1095
 
1096
1096
    s->picture.reference = 0;
1097
1097
    s->picture.key_frame = 1;
1098
 
    s->picture.pict_type = FF_I_TYPE;
 
1098
    s->picture.pict_type = AV_PICTURE_TYPE_I;
1099
1099
    avctx->pix_fmt   = s->sys->pix_fmt;
1100
1100
    avctx->time_base = s->sys->time_base;
1101
1101
    avcodec_set_dimensions(avctx, s->sys->width, s->sys->height);
1264
1264
    c->pix_fmt           = s->sys->pix_fmt;
1265
1265
    s->picture           = *((AVFrame *)data);
1266
1266
    s->picture.key_frame = 1;
1267
 
    s->picture.pict_type = FF_I_TYPE;
 
1267
    s->picture.pict_type = AV_PICTURE_TYPE_I;
1268
1268
 
1269
1269
    s->buf = buf;
1270
1270
    c->execute(c, dv_encode_video_segment, s->sys->work_chunks, NULL,
1297
1297
    sizeof(DVVideoContext),
1298
1298
    dvvideo_init_encoder,
1299
1299
    dvvideo_encode_frame,
 
1300
    .capabilities = CODEC_CAP_SLICE_THREADS,
1300
1301
    .pix_fmts  = (const enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE},
1301
1302
    .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
1302
1303
};
1312
1313
    NULL,
1313
1314
    dvvideo_close,
1314
1315
    dvvideo_decode_frame,
1315
 
    CODEC_CAP_DR1,
 
1316
    CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
1316
1317
    NULL,
1317
1318
    .max_lowres = 3,
1318
1319
    .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),