mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
cleanup setting of returned data frame
Originally committed as revision 8125 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
704a2881bc
commit
eba0fcad9e
@ -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;
|
*(AVFrame*)data = *p;
|
||||||
*data_size = sizeof(AVPicture);
|
*data_size = sizeof(AVFrame);
|
||||||
|
|
||||||
return buf_size;
|
return buf_size;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user