From 6109b56de74cfcda6321fcd5e37cac988734119c Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Fri, 6 Dec 2002 01:55:32 +0000 Subject: - sync with ffmpeg (that must fix heiko stream, thanks Michael Niedermayer) - improve ffmpeg support (passing extra data) - aspect ratio still need to be updated to new syntax - use our svq1 decoder since ffmpeg one is segfaulting (buffer overrun - more investigation needed) - img->copy no more CVS patchset: 3437 CVS date: 2002/12/06 01:55:32 --- src/libffmpeg/libavcodec/rv10.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/libffmpeg/libavcodec/rv10.c') diff --git a/src/libffmpeg/libavcodec/rv10.c b/src/libffmpeg/libavcodec/rv10.c index 02da93a6c..8039cdb1e 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; - AVPicture *pict = data; + AVVideoFrame *pict = data; #ifdef DEBUG printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); @@ -505,15 +505,9 @@ static int rv10_decode_frame(AVCodecContext *avctx, if(s->mb_y>=s->mb_height){ MPV_frame_end(s); - pict->data[0] = s->current_picture[0]; - pict->data[1] = s->current_picture[1]; - pict->data[2] = s->current_picture[2]; - pict->linesize[0] = s->linesize; - pict->linesize[1] = s->uvlinesize; - pict->linesize[2] = s->uvlinesize; + *pict= *(AVVideoFrame*)&s->current_picture; - avctx->quality = s->qscale; - *data_size = sizeof(AVPicture); + *data_size = sizeof(AVVideoFrame); }else{ *data_size = 0; } -- cgit v1.2.3