Mercurial > libavcodec.hg
comparison rv10.c @ 2635:eaa57c3336fc libavcodec
PIX_FMT_NONE and related fixes
author | michael |
---|---|
date | Mon, 25 Apr 2005 18:29:06 +0000 |
parents | 67171616ead6 |
children | 78ad77267785 |
comparison
equal
deleted
inserted
replaced
2634:337217ecbb3e | 2635:eaa57c3336fc |
---|---|
558 } | 558 } |
559 | 559 |
560 if(avctx->debug & FF_DEBUG_PICT_INFO){ | 560 if(avctx->debug & FF_DEBUG_PICT_INFO){ |
561 av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1); | 561 av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1); |
562 } | 562 } |
563 | 563 |
564 avctx->pix_fmt = PIX_FMT_YUV420P; | |
565 | |
564 if (MPV_common_init(s) < 0) | 566 if (MPV_common_init(s) < 0) |
565 return -1; | 567 return -1; |
566 | 568 |
567 h263_decode_init_vlc(s); | 569 h263_decode_init_vlc(s); |
568 | 570 |
574 init_vlc(&rv_dc_chrom, DC_VLC_BITS, 256, | 576 init_vlc(&rv_dc_chrom, DC_VLC_BITS, 256, |
575 rv_chrom_bits, 1, 1, | 577 rv_chrom_bits, 1, 1, |
576 rv_chrom_code, 2, 2, 1); | 578 rv_chrom_code, 2, 2, 1); |
577 done = 1; | 579 done = 1; |
578 } | 580 } |
579 | |
580 avctx->pix_fmt = PIX_FMT_YUV420P; | |
581 | 581 |
582 return 0; | 582 return 0; |
583 } | 583 } |
584 | 584 |
585 static int rv10_decode_end(AVCodecContext *avctx) | 585 static int rv10_decode_end(AVCodecContext *avctx) |