From 6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Wed, 8 Jan 2003 13:18:42 +0000 Subject: syncing ffmpeg (with some compilation fixes) - fixes wma bugs - mace, huffyuv and mp3 decoders imported (but not enabled) tested: wma (v1 and v2), mpeg4, msmpeg4 v1, v2 and v3, divx3, divx4, divx5, xvid and dv decoders. everything looks fine. CVS patchset: 3828 CVS date: 2003/01/08 13:18:42 --- src/libffmpeg/libavcodec/rv10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libffmpeg/libavcodec/rv10.c') diff --git a/src/libffmpeg/libavcodec/rv10.c b/src/libffmpeg/libavcodec/rv10.c index 8039cdb1e..4907c2347 100644 --- a/src/libffmpeg/libavcodec/rv10.c +++ b/src/libffmpeg/libavcodec/rv10.c @@ -472,7 +472,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, { MpegEncContext *s = avctx->priv_data; int i; - AVVideoFrame *pict = data; + AVFrame *pict = data; #ifdef DEBUG printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); @@ -505,9 +505,9 @@ static int rv10_decode_frame(AVCodecContext *avctx, if(s->mb_y>=s->mb_height){ MPV_frame_end(s); - *pict= *(AVVideoFrame*)&s->current_picture; + *pict= *(AVFrame*)&s->current_picture; - *data_size = sizeof(AVVideoFrame); + *data_size = sizeof(AVFrame); }else{ *data_size = 0; } -- cgit v1.2.3