Browse Source

cleanup setting of returned data frame

Originally committed as revision 8125 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Aurelien Jacobs 18 years ago
parent
commit
eba0fcad9e
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      libavcodec/vp56.c

+ 2
- 3
libavcodec/vp56.c View File

@@ -496,7 +496,6 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
{ {
vp56_context_t *s = avctx->priv_data; vp56_context_t *s = avctx->priv_data;
AVFrame *const p = s->framep[VP56_FRAME_CURRENT]; AVFrame *const p = s->framep[VP56_FRAME_CURRENT];
AVFrame *picture = data;
int mb_row, mb_col, mb_row_flip, mb_offset = 0; int mb_row, mb_col, mb_row_flip, mb_offset = 0;
int block, y, uv, stride_y, stride_uv; int block, y, uv, stride_y, stride_uv;
int golden_frame = 0; int golden_frame = 0;
@@ -607,8 +606,8 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT], FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT],
s->framep[VP56_FRAME_PREVIOUS]); s->framep[VP56_FRAME_PREVIOUS]);


*picture = *p;
*data_size = sizeof(AVPicture);
*(AVFrame*)data = *p;
*data_size = sizeof(AVFrame);


return buf_size; return buf_size;
} }


Loading…
Cancel
Save