summaryrefslogtreecommitdiffstats
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-12-04 10:04:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-12-04 10:04:03 +0000
commit1e491e29c27cf6a6925666e4f4eac41b65e263d7 (patch)
tree99879470b8deeb55e7d88c62729b62ac27d249ee /libavcodec/rv10.c
parent855ea723b0ea450137e54674179751c14e8fc6b5 (diff)
downloadffmpeg-streaming-1e491e29c27cf6a6925666e4f4eac41b65e263d7.zip
ffmpeg-streaming-1e491e29c27cf6a6925666e4f4eac41b65e263d7.tar.gz
cleanup
adding AVVideoFrame moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame removing obsolete variables in AVCodecContext skiping of MBs in b frames correctly initalizing AVCodecContext picture buffer cleanup Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 02da93a..8039cdb 100644
--- a/libavcodec/rv10.c
+++ b/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;
}
OpenPOWER on IntegriCloud