From 5430b070a85126da5905d4c0d3d1b1ef39c7042d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 10 Mar 2006 20:40:52 +0000 Subject: cleanup picture / debug output code Originally committed as revision 5140 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rv10.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libavcodec/rv10.c') diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 0b90cc2..d48e0df 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -741,15 +741,16 @@ static int rv10_decode_frame(AVCodecContext *avctx, ff_er_frame_end(s); MPV_frame_end(s); - if(s->pict_type==B_TYPE || s->low_delay){ - *pict= *(AVFrame*)&s->current_picture; - ff_print_debug_info(s, pict); - } else { - *pict= *(AVFrame*)&s->last_picture; - ff_print_debug_info(s, pict); + if (s->pict_type == B_TYPE || s->low_delay) { + *pict= *(AVFrame*)s->current_picture_ptr; + } else if (s->last_picture_ptr != NULL) { + *pict= *(AVFrame*)s->last_picture_ptr; } - if(s->last_picture_ptr || s->low_delay) + + if(s->last_picture_ptr || s->low_delay){ *data_size = sizeof(AVFrame); + ff_print_debug_info(s, pict); + } s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...) } -- cgit v1.1