Mercurial > libavcodec.hg
comparison vp56.c @ 4596:4992cbff45c6 libavcodec
cleanup setting of returned data frame
author | aurel |
---|---|
date | Sun, 25 Feb 2007 16:02:32 +0000 |
parents | 340c876320eb |
children | 2b72f9bc4f06 |
comparison
equal
deleted
inserted
replaced
4595:340c876320eb | 4596:4992cbff45c6 |
---|---|
494 int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, | 494 int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, |
495 uint8_t *buf, int buf_size) | 495 uint8_t *buf, int buf_size) |
496 { | 496 { |
497 vp56_context_t *s = avctx->priv_data; | 497 vp56_context_t *s = avctx->priv_data; |
498 AVFrame *const p = s->framep[VP56_FRAME_CURRENT]; | 498 AVFrame *const p = s->framep[VP56_FRAME_CURRENT]; |
499 AVFrame *picture = data; | |
500 int mb_row, mb_col, mb_row_flip, mb_offset = 0; | 499 int mb_row, mb_col, mb_row_flip, mb_offset = 0; |
501 int block, y, uv, stride_y, stride_uv; | 500 int block, y, uv, stride_y, stride_uv; |
502 int golden_frame = 0; | 501 int golden_frame = 0; |
503 int res; | 502 int res; |
504 | 503 |
605 s->framep[VP56_FRAME_GOLDEN] = p; | 604 s->framep[VP56_FRAME_GOLDEN] = p; |
606 } | 605 } |
607 FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT], | 606 FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT], |
608 s->framep[VP56_FRAME_PREVIOUS]); | 607 s->framep[VP56_FRAME_PREVIOUS]); |
609 | 608 |
610 *picture = *p; | 609 *(AVFrame*)data = *p; |
611 *data_size = sizeof(AVPicture); | 610 *data_size = sizeof(AVFrame); |
612 | 611 |
613 return buf_size; | 612 return buf_size; |
614 } | 613 } |
615 | 614 |
616 void vp56_init(vp56_context_t *s, AVCodecContext *avctx, int flip) | 615 void vp56_init(vp56_context_t *s, AVCodecContext *avctx, int flip) |