← Back to branch summary

~siretart/libav/merge.raring.libav-0.8.6

« back to all changes in this revision

Viewing changes to libavcodec/pgssubdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.4.1)
  • mto: (1.3.11 sid) (26.1.1 quantal-security)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: package-import@ubuntu.com-20120112223000-s1reiy1e28hnix42
Tags: upstream-0.8~beta2
Import upstream version 0.8~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/pgssubdec.c
198
198
 
199
199
    /* Make sure the bitmap is not too large */
200
200
    if (avctx->width < width || avctx->height < height) {
201
 
        av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger then video.\n");
 
201
        av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger than video.\n");
202
202
        return -1;
203
203
    }
204
204
 
469
469
}
470
470
 
471
471
AVCodec ff_pgssub_decoder = {
472
 
    "pgssub",
473
 
    AVMEDIA_TYPE_SUBTITLE,
474
 
    CODEC_ID_HDMV_PGS_SUBTITLE,
475
 
    sizeof(PGSSubContext),
476
 
    init_decoder,
477
 
    NULL,
478
 
    close_decoder,
479
 
    decode,
 
472
    .name           = "pgssub",
 
473
    .type           = AVMEDIA_TYPE_SUBTITLE,
 
474
    .id             = CODEC_ID_HDMV_PGS_SUBTITLE,
 
475
    .priv_data_size = sizeof(PGSSubContext),
 
476
    .init           = init_decoder,
 
477
    .close          = close_decoder,
 
478
    .decode         = decode,
480
479
    .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
481
480
};