← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/huffyuv.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/huffyuv.c
921
921
 
922
922
#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER
923
923
static void draw_slice(HYuvContext *s, int y){
924
 
    int h, cy;
925
 
    int offset[4];
 
924
    int h, cy, i;
 
925
    int offset[AV_NUM_DATA_POINTERS];
926
926
 
927
927
    if(s->avctx->draw_horiz_band==NULL)
928
928
        return;
939
939
    offset[0] = s->picture.linesize[0]*y;
940
940
    offset[1] = s->picture.linesize[1]*cy;
941
941
    offset[2] = s->picture.linesize[2]*cy;
942
 
    offset[3] = 0;
 
942
    for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
 
943
        offset[i] = 0;
943
944
    emms_c();
944
945
 
945
946
    s->avctx->draw_horiz_band(s->avctx, &s->picture, offset, y, 3, h);
1435
1436
 
1436
1437
#if CONFIG_HUFFYUV_DECODER
1437
1438
AVCodec ff_huffyuv_decoder = {
1438
 
    "huffyuv",
1439
 
    AVMEDIA_TYPE_VIDEO,
1440
 
    CODEC_ID_HUFFYUV,
1441
 
    sizeof(HYuvContext),
1442
 
    decode_init,
1443
 
    NULL,
1444
 
    decode_end,
1445
 
    decode_frame,
1446
 
    CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS,
1447
 
    NULL,
 
1439
    .name           = "huffyuv",
 
1440
    .type           = AVMEDIA_TYPE_VIDEO,
 
1441
    .id             = CODEC_ID_HUFFYUV,
 
1442
    .priv_data_size = sizeof(HYuvContext),
 
1443
    .init           = decode_init,
 
1444
    .close          = decode_end,
 
1445
    .decode         = decode_frame,
 
1446
    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS,
1448
1447
    .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
1449
1448
    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
1450
1449
};
1452
1451
 
1453
1452
#if CONFIG_FFVHUFF_DECODER
1454
1453
AVCodec ff_ffvhuff_decoder = {
1455
 
    "ffvhuff",
1456
 
    AVMEDIA_TYPE_VIDEO,
1457
 
    CODEC_ID_FFVHUFF,
1458
 
    sizeof(HYuvContext),
1459
 
    decode_init,
1460
 
    NULL,
1461
 
    decode_end,
1462
 
    decode_frame,
1463
 
    CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS,
1464
 
    NULL,
 
1454
    .name           = "ffvhuff",
 
1455
    .type           = AVMEDIA_TYPE_VIDEO,
 
1456
    .id             = CODEC_ID_FFVHUFF,
 
1457
    .priv_data_size = sizeof(HYuvContext),
 
1458
    .init           = decode_init,
 
1459
    .close          = decode_end,
 
1460
    .decode         = decode_frame,
 
1461
    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS,
1465
1462
    .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
1466
1463
    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
1467
1464
};
1469
1466
 
1470
1467
#if CONFIG_HUFFYUV_ENCODER
1471
1468
AVCodec ff_huffyuv_encoder = {
1472
 
    "huffyuv",
1473
 
    AVMEDIA_TYPE_VIDEO,
1474
 
    CODEC_ID_HUFFYUV,
1475
 
    sizeof(HYuvContext),
1476
 
    encode_init,
1477
 
    encode_frame,
1478
 
    encode_end,
 
1469
    .name           = "huffyuv",
 
1470
    .type           = AVMEDIA_TYPE_VIDEO,
 
1471
    .id             = CODEC_ID_HUFFYUV,
 
1472
    .priv_data_size = sizeof(HYuvContext),
 
1473
    .init           = encode_init,
 
1474
    .encode         = encode_frame,
 
1475
    .close          = encode_end,
1479
1476
    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE},
1480
1477
    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
1481
1478
};
1483
1480
 
1484
1481
#if CONFIG_FFVHUFF_ENCODER
1485
1482
AVCodec ff_ffvhuff_encoder = {
1486
 
    "ffvhuff",
1487
 
    AVMEDIA_TYPE_VIDEO,
1488
 
    CODEC_ID_FFVHUFF,
1489
 
    sizeof(HYuvContext),
1490
 
    encode_init,
1491
 
    encode_frame,
1492
 
    encode_end,
 
1483
    .name           = "ffvhuff",
 
1484
    .type           = AVMEDIA_TYPE_VIDEO,
 
1485
    .id             = CODEC_ID_FFVHUFF,
 
1486
    .priv_data_size = sizeof(HYuvContext),
 
1487
    .init           = encode_init,
 
1488
    .encode         = encode_frame,
 
1489
    .close          = encode_end,
1493
1490
    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE},
1494
1491
    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
1495
1492
};