comparison rv10.c @ 3185:333e016c2c8a libavcodec

cleanup picture / debug output code
author michael
date Fri, 10 Mar 2006 20:40:52 +0000
parents 8d1b2cc2a75b
children 525c73deb1d5
comparison
equal deleted inserted replaced
3184:68d7896a08e4 3185:333e016c2c8a
739 739
740 if(s->mb_y>=s->mb_height){ 740 if(s->mb_y>=s->mb_height){
741 ff_er_frame_end(s); 741 ff_er_frame_end(s);
742 MPV_frame_end(s); 742 MPV_frame_end(s);
743 743
744 if(s->pict_type==B_TYPE || s->low_delay){ 744 if (s->pict_type == B_TYPE || s->low_delay) {
745 *pict= *(AVFrame*)&s->current_picture; 745 *pict= *(AVFrame*)s->current_picture_ptr;
746 } else if (s->last_picture_ptr != NULL) {
747 *pict= *(AVFrame*)s->last_picture_ptr;
748 }
749
750 if(s->last_picture_ptr || s->low_delay){
751 *data_size = sizeof(AVFrame);
746 ff_print_debug_info(s, pict); 752 ff_print_debug_info(s, pict);
747 } else { 753 }
748 *pict= *(AVFrame*)&s->last_picture;
749 ff_print_debug_info(s, pict);
750 }
751 if(s->last_picture_ptr || s->low_delay)
752 *data_size = sizeof(AVFrame);
753 s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...) 754 s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...)
754 } 755 }
755 756
756 return buf_size; 757 return buf_size;
757 } 758 }