comparison mpeg12.c @ 1218:358bbc952e27 libavcodec

10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)

1217:eb2affe57a2a

                }
            }
        }
    }        
    pc->state= state;
    return -1;
}

/* handle buffering and image synchronisation */
static int mpeg_decode_frame(AVCodecContext *avctx, 
                             void *data, int *data_size,

        }
        return 0;
    }

    if(s2->flags&CODEC_FLAG_TRUNCATED){
        int next;
        
        next= mpeg1_find_frame_end(s2, buf, buf_size);
        
        if( ff_combine_frame(s2, next, &buf, &buf_size) < 0 )
            return buf_size;
    }    
    

                                                start_code, &buf_ptr, input_size);

                        if (ret == DECODE_SLICE_EOP) {
                            if(s2->last_picture_ptr) //FIXME merge with the stuff in mpeg_decode_slice
                                *data_size = sizeof(AVPicture);
                            return FFMAX(1, buf_ptr - buf - s2->parse_context.last_index);
                        }else if(ret < 0){
                            if(ret == DECODE_SLICE_ERROR)
                                ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
                                
                            fprintf(stderr,"Error while decoding slice\n");

1218:358bbc952e27

                }
            }
        }
    }        
    pc->state= state;
    return END_NOT_FOUND;
}

/* handle buffering and image synchronisation */
static int mpeg_decode_frame(AVCodecContext *avctx, 
                             void *data, int *data_size,

        }
        return 0;
    }

    if(s2->flags&CODEC_FLAG_TRUNCATED){
        int next= mpeg1_find_frame_end(s2, buf, buf_size);
        
        if( ff_combine_frame(s2, next, &buf, &buf_size) < 0 )
            return buf_size;
    }    
    

                                                start_code, &buf_ptr, input_size);

                        if (ret == DECODE_SLICE_EOP) {
                            if(s2->last_picture_ptr) //FIXME merge with the stuff in mpeg_decode_slice
                                *data_size = sizeof(AVPicture);
                            return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
                        }else if(ret < 0){
                            if(ret == DECODE_SLICE_ERROR)
                                ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
                                
                            fprintf(stderr,"Error while decoding slice\n");