aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-02-25 16:02:32 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-02-25 16:02:32 +0000
commiteba0fcad9e905c31857d710aa7bbc5bcbcd5f2cd (patch)
tree7fb41ced6bc19eafd2af6c232dbaabe4c710e14b /libavcodec
parent704a2881bc7787592889a5c3d48ef4ce8398214d (diff)
downloadffmpeg-eba0fcad9e905c31857d710aa7bbc5bcbcd5f2cd.tar.gz
cleanup setting of returned data frame
Originally committed as revision 8125 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vp56.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index a3fec1d2bf..abd1b3a63f 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -496,7 +496,6 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
{
vp56_context_t *s = avctx->priv_data;
AVFrame *const p = s->framep[VP56_FRAME_CURRENT];
- AVFrame *picture = data;
int mb_row, mb_col, mb_row_flip, mb_offset = 0;
int block, y, uv, stride_y, stride_uv;
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],
s->framep[VP56_FRAME_PREVIOUS]);
- *picture = *p;
- *data_size = sizeof(AVPicture);
+ *(AVFrame*)data = *p;
+ *data_size = sizeof(AVFrame);
return buf_size;
}